Commit 67fd8f06 authored by Yuri Chornoivan's avatar Yuri Chornoivan

Fix some minor EBN issues

parent 4e730584
......@@ -14,9 +14,9 @@
#include <kdedmodule.h>
#include "settings.h"
#include <QtCore/QObject>
#include <QtDBus/QtDBus>
#include <QtGui/QKeySequence>
#include <QObject>
#include <QtDBus>
#include <QKeySequence>
#include <KService>
......
......@@ -24,7 +24,7 @@
#include <qtest_kde.h>
#include <QtDBus/QtDBus>
#include <QDBusInterface>
void Test::initTestCase()
......
#ifndef LIBKHOTKEYS_TEST_H
#define LIBKHOTKEYS_TEST_H
#include <QtCore/QObject>
#include <QObject>
class Test : public QObject
{
......
......@@ -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}
......@@ -59,7 +59,7 @@ public:
return static_cast<const KHotKeys::ActionDataBase*>( _data );
}
//! Are there uncommited changes?
//! Are there uncommitted changes?
bool isChanged() const Q_DECL_OVERRIDE;
void setActionData( KHotKeys::ActionDataGroup *group );
......
......@@ -31,7 +31,7 @@
#include "condition_type_menu.h"
#include <QtCore/QStack>
#include <QStack>
#include <QDebug>
......
......@@ -57,7 +57,7 @@ public:
void setConditionsList(KHotKeys::Condition_list *list);
//! Are there uncommited changes?
//! Are there uncommitted changes?
bool hasChanges() const;
Q_SIGNALS:
......
......@@ -30,8 +30,8 @@
#include <QDebug>
#include <KUrl>
#include <QtCore/QSignalMapper>
#include <QtGui/QContextMenuEvent>
#include <QSignalMapper>
#include <QContextMenuEvent>
#include <QFileDialog>
......@@ -237,7 +237,7 @@ void HotkeysTreeViewContextMenu::exportAction()
break;
default:
// Unknown value alled to our ui file. Use disabled as a
// Unknown value fallen to our ui file. Use disabled as a
// default.
Q_ASSERT(false);
state = KHotKeys::Disabled;
......
......@@ -664,7 +664,7 @@ bool KHotkeysModel::setData( const QModelIndex &index, const QVariant &value, in
: action->disable();
// If this is a group we have to inform the view that all our
// childs have changed. They are all disabled now
// children have changed. They are all disabled now
KHotKeys::ActionDataGroup *actionGroup = indexToActionDataGroup(index);
if (actionGroup && actionGroup->size())
{
......
......@@ -22,7 +22,7 @@
#include "libkhotkeysfwd.h"
#include "settings.h"
#include <QtCore/QAbstractItemModel>
#include <QAbstractItemModel>
/**
......
......@@ -29,7 +29,7 @@
#include "KDE/KLocale"
#include "KDE/KDebug"
#include <QtGui/QContextMenuEvent>
#include <QContextMenuEvent>
HotkeysTreeView::HotkeysTreeView( QWidget *parent )
......
......@@ -39,7 +39,8 @@
#include "hotkeys_tree_view.h"
#include "khotkeysglobal.h"
#include <QtDBus/QtDBus>
#include <QDBusConnection>
#include <QDBusError>
#include <KAboutData>
#include <QDebug>
......
......@@ -22,7 +22,7 @@
#include "action_data/action_data.h"
#include "triggers/triggers.h"
#include <QtGui/QKeySequence>
#include <QKeySequence>
#include <QDebug>
......
......@@ -13,8 +13,8 @@
#include "kdemacros.h"
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QObject>
#include <QString>
class KConfigGroup;
......@@ -180,7 +180,7 @@ class Q_DECL_EXPORT ActionDataBase : public QObject
QString _importId;
//! Is it allowed to merge this directory with others. Used when
//exporting and importig the directory
//exporting and importing the directory
bool _allowMerging;
};
......
......@@ -89,7 +89,7 @@ class Q_DECL_EXPORT ActionDataGroup
const QList<ActionDataBase*> children() const;
/**
* Number of childrens.
* Number of children.
*/
int size() const;
......
......@@ -20,9 +20,9 @@
#include "conditions/condition.h"
#include <QtCore/QObject>
#include <QObject>
#include <QtGui/qwindowdefs.h>
#include <QWindowList>
class KConfigGroup;
......
......@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QObject>
#include <QString>
#include "kdemacros.h"
......
......@@ -21,7 +21,7 @@
#include "conditions/conditions_list_base.h"
#include <QtCore/QString>
#include <QString>
class KConfigGroup;
......
......@@ -23,7 +23,7 @@
#include "kdemacros.h"
#include <QtCore/QList>
#include <QList>
class KConfigGroup;
......
......@@ -20,9 +20,9 @@
#include "conditions/condition.h"
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtGui/qwindowdefs.h>
#include <QObject>
#include <QString>
#include <QWindowList>
#include <KConfig> // Needed because of some Qt Status redefinitions
#include <KConfigGroup> // Needed because of some Qt Status redefinitions
......
......@@ -22,7 +22,11 @@
#include "khotkeysglobal.h"
#include <QtDBus/QtDBus>
#include <QDBusConnection>
#include <QDBusError>
#include <QDBusInterface>
#include <QDBusMessage>
#include <QDBusReply>
#include <KConfigGroup>
#include <KConfig>
......
......@@ -16,7 +16,7 @@
#include <KLocalizedString>
#include <kdemacros.h>
#include <QtCore/QPointer>
#include <QPointer>
class QObject;
......
......@@ -453,7 +453,7 @@ bool Settings::reread_settings(bool include_disabled)
gesture_mouse_button = qBound( 2, gesture_mouse_button, 9 );
gesture_timeout = gesturesConfig.readEntry( "Timeout", gesture_timeout );
// Somhow gesture_timeout found it's way into my config file. Fix it for
// Somehow gesture_timeout found it's way into my config file. Fix it for
// everyone else too.
if (gesture_timeout < 100) gesture_timeout = 300;
......
......@@ -111,7 +111,7 @@ public:
/**
* Take the actions.
*
* \note Ownership is transfered to you. Subsequent calls to action() will
* \note Ownership is transferred to you. Subsequent calls to action() will
* return 0
*/
ActionDataGroup *takeActions();
......
......@@ -154,7 +154,7 @@ KHotKeys::ActionDataGroup *SettingsReaderV2::readGroup(
break;
default:
qWarning() << "Unkown stateStrategy";
qWarning() << "Unknown stateStrategy";
Q_ASSERT(false);
break;
};
......@@ -228,7 +228,7 @@ KHotKeys::ActionDataBase *SettingsReaderV2::readActionData(
break;
default:
qWarning() << "Unkown stateStrategy";
qWarning() << "Unknown stateStrategy";
Q_ASSERT(false);
break;
};
......
......@@ -21,7 +21,7 @@
#include "action_data/action_data_visitor.h"
#include <QtCore/QStack>
#include <QStack>
#include "settings.h"
......
......@@ -35,7 +35,7 @@
#include <KShortcut>
#include <QAction>
#include <QtCore/QUuid>
#include <QUuid>
#include <kkeyserver.h>
namespace KHotKeys {
......
......@@ -19,8 +19,8 @@
***************************************************************************/
#include "sound.h"
#include <QtCore/QFile>
#include <QtCore/QDataStream>
#include <QFile>
#include <QDataStream>
#include <QDebug>
......
......@@ -21,7 +21,7 @@
#define SOUND_H
#include <QVector>
#include <QtCore/QCharRef>
#include <QCharRef>
#include <kdemacros.h>
/**
......
......@@ -22,7 +22,7 @@
#include <QDebug>
#include <klocale.h>
#include <QtCore/QTimer>
#include <QTimer>
#include <klibrary.h>
#include "khotkeysglobal.h"
......
......@@ -20,7 +20,7 @@
#ifndef RECORDER_H
#define RECORDER_H
#include <QtCore/QObject>
#include <QObject>
#include "sound.h"
#include <kdemacros.h>
......
......@@ -20,9 +20,9 @@
#ifndef _TRIGGERS_H_
#define _TRIGGERS_H_
#include <QtCore/QList>
#include <QtCore/QMap>
#include <QtCore/QUuid>
#include <QList>
#include <QMap>
#include <QUuid>
#include <KShortcut>
......
......@@ -24,7 +24,7 @@
#include <kapplication.h>
#include <QDebug>
#include <kxerrorhandler.h>
#include <QtCore/QTimer>
#include <QTimer>
#include <X11/Xlib.h>
......
......@@ -30,7 +30,7 @@
#include <QDebug>
#include <QtCore/QDate>
#include <QDate>
#undef Complex
......
......@@ -22,7 +22,7 @@
#include <QVector>
#include <QtCore/QMap>
#include <QMap>
#include <kdemacros.h>
#include <KConfig>
......
......@@ -19,8 +19,8 @@
#include <kdemacros.h>
#include <QtCore/QObject>
#include <QtGui/qwindowdefs.h>
#include <QObject>
#include <QWindowList>
#include <netwm.h>
......@@ -35,7 +35,6 @@ const NET::WindowTypes SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::Desk
class Windowdef_list;
class Q_DECL_EXPORT WindowsHandler : public QObject
#include <QtGui/qwindowdefs.h>
{
Q_OBJECT
public:
......
......@@ -18,11 +18,11 @@
*/
#include <QtCore/QString>
#include <QString>
#include "KConfigGroup"
#include <QtGui/qwindowdefs.h>
#include <QWindowList>
#include <netwm_def.h>
#include <kdemacros.h>
......
......@@ -19,7 +19,7 @@
#include "windows_helper/window_selection_interface.h"
#include <QtCore/QList>
#include <QList>
namespace KHotKeys {
......
......@@ -15,7 +15,6 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "windows_helper/window_selection_rules.h"
#include "windows_helper/window_selection_rules.h"
#include <KLocalizedString>
......
......@@ -76,7 +76,7 @@ class Q_DECL_EXPORT Windowdef_simple : public Windowdef
Windowdef_simple( KConfigGroup& cfg_P );
/**
* Match agains window @p window_P
* Match against window @p window_P
*/
bool match( const Window_data& window_P ) Q_DECL_OVERRIDE;
......
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