Commit 89ff12d2 authored by Yuri Chornoivan's avatar Yuri Chornoivan

Fix minor EBN issues

parent 08983522
......@@ -18,6 +18,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
***************************************************************************/
#ifndef ACTIONLIST_H
#define ACTIONLIST_H
#include <QVariant>
#include <KService>
......@@ -68,3 +71,5 @@ bool handleAppstreamActions(const QString &actionId, const QVariant &argument);
QString resolvedServiceEntryPath(const KService::Ptr &service);
}
#endif
......@@ -613,7 +613,7 @@ Item {
target: tabBar
//Set the opacity and NOT the visibility, as visibility is recursive
//and this binding would be executed also on popup show/hide
//as recomended by the docs: http://doc.qt.io/qt-5/qml-qtquick-item.html#visible-prop
//as recommended by the docs: http://doc.qt.io/qt-5/qml-qtquick-item.html#visible-prop
//plus, it triggers https://bugreports.qt.io/browse/QTBUG-66907
//in which a mousearea may think it's under the mouse while it isn't
opacity: tabBar.count > 1 ? 1 : 0
......
......@@ -27,4 +27,4 @@ Item {
rightMargin: units.gridUnit
}
}
}
\ No newline at end of file
}
......@@ -15,8 +15,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GDKACCELPARSE_P_H
#define GDKACCELPARSE_P_H
#ifndef GTKACCELPARSE_P_H
#define GTKACCELPARSE_P_H
#include <glib.h>
......
......@@ -419,7 +419,7 @@ Column {
}
}
// In case the window title had only redundant informations (i.e. appName), text is now empty.
// In case the window title had only redundant information (i.e. appName), text is now empty.
// Add a hyphen to indicate that and avoid empty space.
if (text == "") {
text = "";
......
......@@ -439,7 +439,7 @@ QRect Backend::globalRect(QQuickItem *item) const
void Backend::ungrabMouse(QQuickItem *item) const
{
//this is a workaround where Qt will fail to realise a mouse has been released
//this is a workaround where Qt will fail to realize a mouse has been released
// this happens if a window which does not accept focus spawns a new window that takes focus and X grab
// whilst the mouse is depressed
......
......@@ -195,7 +195,7 @@ void Backend::update(const QString &uri, const QMap<QString, QVariant> &properti
updateLauncherProperty(storageId, properties, QStringLiteral("count"), &foundEntry->count, &Backend::countChanged);
updateLauncherProperty(storageId, properties, QStringLiteral("count-visible"), &foundEntry->countVisible, &Backend::countVisibleChanged);
// the API gives us progress as 0..1 double but we'll use percent to avoid unneccessary
// the API gives us progress as 0..1 double but we'll use percent to avoid unnecessary
// changes when it just changed a fraction of a percent, hence not using our fancy updateLauncherProperty method
auto foundProgress = properties.constFind(QStringLiteral("progress"));
if (foundProgress != propertiesEnd) {
......
......@@ -27,7 +27,6 @@
#include "attica_plugin_debug.h"
#include <KConfigGroup>
#include "attica_plugin_debug.h"
#include <KWallet/KWallet>
#include <kcmultidialog.h>
#include <KLocalizedString>
......
......@@ -41,4 +41,4 @@
#cmakedefine HAS_RANDR_1_3 1
/* Define if you have X11 at all */
#define HAVE_X11 ${X11_FOUND}
\ No newline at end of file
#define HAVE_X11 ${X11_FOUND}
......@@ -346,7 +346,7 @@ FocusScope {
// Moving from an item to its preview popup dialog doesn't unset hoveredItem
// even though the cursor has left it, so we need to check whether the click
// actually occured inside the item we expect it in before going ahead. If it
// actually occurred inside the item we expect it in before going ahead. If it
// didn't, clean up (e.g. dismissing the dialog as a side-effect of unsetting
// hoveredItem) and abort.
if (pos.x < 0 || pos.x > hoveredItem.width || pos.y < 0 || pos.y > hoveredItem.height) {
......
......@@ -21,8 +21,6 @@
#include "positionertest.h"
#include <QTest>
#include <QTest>
#include <QTemporaryDir>
#include <QSignalSpy>
......
......@@ -96,8 +96,8 @@ function addApplet(applet, x, y) {
// FIXME TODO: This is a real-world fix to produce a sensible initial position for
// launcher icons added by launcher menu applets. The basic approach has been used
// since Plasma 1. However, "add launcher to X" is a generic-enough concept and
// frequent-enough occurence that we'd like to abstract it further in the future
// and get rid of the uglyness of parties external to the containment adding applets
// frequent-enough occurrence that we'd like to abstract it further in the future
// and get rid of the ugliness of parties external to the containment adding applets
// of a specific type, and the containment caring about the applet type. In a better
// system the containment would be informed of requested launchers, and determine by
// itself what it wants to do with that information.
......
......@@ -248,7 +248,7 @@ Rectangle {
return;
}
// when an item withing ScrollView has active focus the ScrollView,
// when an item within ScrollView has active focus the ScrollView,
// as FocusScope, also has it, so we only scroll in this case
if (!scroll.activeFocus) {
return;
......
......@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef SORTED_ACTIVITY_MODEL
#define SORTED_ACTIVITY_MODEL
#ifndef SORTED_ACTIVITIES_MODEL_H
#define SORTED_ACTIVITIES_MODEL_H
// Qt
#include <QSortFilterProxyModel>
......@@ -90,5 +90,5 @@ private:
QHash<QString, QVector<WId>> m_activitiesWindows;
};
#endif // SORTED_ACTIVITY_MODEL
#endif // SORTED_ACTIVITIES_MODEL_H
......@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EXTRA_ACTIVITES_INTERFACE_H
#define EXTRA_ACTIVITES_INTERFACE_H
#ifndef EXTRA_ACTIVITIES_INTERFACE_H
#define EXTRA_ACTIVITIES_INTERFACE_H
#include <QAbstractListModel>
......@@ -47,4 +47,4 @@ private:
D_PTR;
};
#endif // EXTRA_ACTIVITES_INTERFACE_H
#endif // EXTRA_ACTIVITIES_INTERFACE_H
......@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef UTILS_OPTIONAL_H
#define UTILS_OPTIONAL_H
#ifndef UTILS_OPTIONAL_VIEW_H
#define UTILS_OPTIONAL_VIEW_H
namespace kamd {
namespace utils {
......@@ -75,5 +75,5 @@ optional_view<T> make_optional_view(const T &value)
} // namespace kamd
#endif // UTILS_OPTIONAL_H
#endif // UTILS_OPTIONAL_VIEW_H
......@@ -327,7 +327,7 @@ bool FolderSelectionWidget::shouldShowMountPoint(const QString& mountPoint)
return false;
// The user's home directory is forcibly added so we can ignore /home
// if /home actually contains the home direcory
// if /home actually contains the home directory
if (mountPoint.startsWith(QLatin1String("/home")) && QDir::homePath().startsWith(QLatin1String("/home")))
return false;
......
......@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __SCHEMEPREVIEW_H__
#define __SCHEMEPREVIEW_H__
#ifndef __PREVIEWWIDGET_H__
#define __PREVIEWWIDGET_H__
#include <QFrame>
#include <QPalette>
......
......@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __SCHEMEPREVIEWSET_H__
#define __SCHEMEPREVIEWSET_H__
#ifndef __SETPREVIEWWIDGET_H__
#define __SETPREVIEWWIDGET_H__
#include <QFrame>
#include <QPalette>
......
......@@ -118,7 +118,7 @@ private:
// This index refers to the CursorThemeModel, not the proxy or the view
QPersistentModelIndex m_appliedIndex;
/** Holds the last size that was choosen by the user. Example: The user chooses
/** Holds the last size that was chosen by the user. Example: The user chooses
theme1 which provides the sizes 24 and 36. He chooses 36. preferredSize gets
set to 36. Now, he switchs to theme2 which provides the sizes 30 and 40.
preferredSize still is 36, so the UI will default to 40, which is next to 36.
......
......@@ -28,7 +28,6 @@
#include <KGlobal>
#include <KMessageBox>
#include <QIcon>
#include <KAboutData>
#include <KStandardDirs>
#include <KFileDialog>
......
......@@ -15,6 +15,9 @@
* along with this program; if not, write to the Free Software
*/
#ifndef WRITEEXPORTS_H
#define WRITEEXPORTS_H
#include <QDebug>
#include <QFile>
#include <QStandardPaths>
......@@ -101,3 +104,5 @@ void writeExports()
out << script;
file.close();
}
#endif
......@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef SHORTCUTS_MODULE_H
#define SHORTCUTS_MODULE_H
#ifndef GLOBAL_SHORTCUTS_H
#define GLOBAL_SHORTCUTS_H
#include <kcmodule.h>
#include <QHash>
......
......@@ -540,7 +540,7 @@ void CGroupList::clear()
itsGroups.append(itsSpecialGroups[CGroupListItem::PERSONAL]);
itsGroups.append(itsSpecialGroups[CGroupListItem::SYSTEM]);
}
// Dont add 'Unclassif' until we have some user groups
// Don't add 'Unclassif' until we have some user groups
endResetModel();
}
......
......@@ -40,7 +40,6 @@
#include <QBoxLayout>
#include <QEvent>
#include <QResizeEvent>
#include <QApplication>
#include <QDesktopWidget>
namespace KFI
......
......@@ -18,6 +18,9 @@
*
*/
#ifndef KDELIBS4CONFIG_H
#define KDELIBS4CONFIG_H
#include <KSharedConfig>
#include <KConfigGroup>
#include <Kdelibs4Migration>
......@@ -39,3 +42,4 @@ public:
};
#endif
......@@ -122,7 +122,7 @@ void LibinputConfig::load()
if (!m_backend->getConfig()) {
m_errorMessage->setMessageType(KMessageWidget::Error);
m_errorMessage->setText(i18n("Error while loading values. See logs for more informations. Please restart this configuration module."));
m_errorMessage->setText(i18n("Error while loading values. See logs for more information. Please restart this configuration module."));
m_errorMessage->animatedShow();
} else {
if (!m_backend->deviceCount()) {
......@@ -138,7 +138,7 @@ void LibinputConfig::save()
{
if (!m_backend->applyConfig()) {
m_errorMessage->setMessageType(KMessageWidget::Error);
m_errorMessage->setText(i18n("Not able to save all changes. See logs for more informations. Please restart this configuration module and try again."));
m_errorMessage->setText(i18n("Not able to save all changes. See logs for more information. Please restart this configuration module and try again."));
m_errorMessage->animatedShow();
} else {
hideErrorMessage();
......
......@@ -113,7 +113,7 @@ void TouchpadConfigLibinput::load()
if (!m_backend->getConfig()) {
m_errorMessage->setMessageType(KMessageWidget::Error);
m_errorMessage->setText(i18n("Error while loading values. See logs for more informations. Please restart this configuration module."));
m_errorMessage->setText(i18n("Error while loading values. See logs for more information. Please restart this configuration module."));
m_errorMessage->animatedShow();
} else {
if (!m_backend->touchpadCount()) {
......@@ -129,7 +129,7 @@ void TouchpadConfigLibinput::save()
{
if (!m_backend->applyConfig()) {
m_errorMessage->setMessageType(KMessageWidget::Error);
m_errorMessage->setText(i18n("Not able to save all changes. See logs for more informations. Please restart this configuration module and try again."));
m_errorMessage->setText(i18n("Not able to save all changes. See logs for more information. Please restart this configuration module and try again."));
m_errorMessage->animatedShow();
} else {
hideErrorMessage();
......
......@@ -13,4 +13,4 @@
<default>false</default>
</entry>
</group>
</kcfg>
\ No newline at end of file
</kcfg>
......@@ -80,7 +80,7 @@ Item {
height: backgroundFrame.height + backgroundFrame.height % 2
//x and y default to 0, so top left would be correct
//If the position is anything else it will updated via onXChanged during intialisation
//If the position is anything else it will updated via onXChanged during initialization
state: "topleft"
onXChanged: stateTimer.restart()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment