Commit 3d544f5f authored by Martin Tobias Holmedahl Sandsmark's avatar Martin Tobias Holmedahl Sandsmark
Browse files

more minor cleanups

parent 6ffb4fe4
......@@ -84,8 +84,8 @@ class KHotKeysModule
KHotKeys::ActionDataGroup* actions_root;
//! The current settings
KHotKeys::Settings _settings;
bool _settingsDirty;
KHotKeys::Settings _settings;
//! Is the module initialized
bool _initialized;
......
......@@ -25,7 +25,7 @@
</widget>
</item>
<item>
<widget class="KPushButton" name="applicationButton" >
<widget class="QPushButton" name="applicationButton" >
<property name="text" >
<string>Select Application ...</string>
</property>
......@@ -39,11 +39,6 @@
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
......
......@@ -65,7 +65,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="KIntSpinBox" name="gestures_timeout">
<widget class="QSpinBox" name="gestures_timeout">
<property name="suffix">
<string> ms</string>
</property>
......@@ -117,7 +117,7 @@
</spacer>
</item>
<item row="1" column="1">
<widget class="KIntSpinBox" name="gestures_button">
<widget class="QSpinBox" name="gestures_button">
<property name="minimum">
<number>2</number>
</property>
......@@ -134,13 +134,6 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KIntSpinBox</class>
<extends>QSpinBox</extends>
<header>knuminput.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>enabled</tabstop>
<tabstop>gestures_group</tabstop>
......
......@@ -213,7 +213,7 @@ void KCMHotkeys::currentChanged( const QModelIndex &pCurrent, const QModelIndex
KCMHotkeys::~KCMHotkeys()
{
delete d; d=0;
delete d; d=nullptr;
}
......
......@@ -61,7 +61,7 @@ static QDBusInterface* Kded()
bool isRunning()
{
std::auto_ptr<QDBusInterface> kded( Kded() );
std::unique_ptr<QDBusInterface> kded( Kded() );
if (!kded->isValid())
{
return false;
......@@ -77,7 +77,7 @@ bool isRunning()
bool reload()
{
// No kded no reload
std::auto_ptr<QDBusInterface> kded( Kded() );
std::unique_ptr<QDBusInterface> kded( Kded() );
if (!kded->isValid())
{
return false;
......@@ -114,7 +114,7 @@ bool reload()
bool start()
{
std::auto_ptr<QDBusInterface> kded( Kded() );
std::unique_ptr<QDBusInterface> kded( Kded() );
if (!kded->isValid())
{
return false;
......@@ -150,7 +150,7 @@ bool stop()
return true;
}
std::auto_ptr<QDBusInterface> kded( Kded() );
std::unique_ptr<QDBusInterface> kded( Kded() );
if (!kded->isValid())
{
return false;
......
......@@ -79,7 +79,7 @@ QAction *ShortcutsHandler::addAction(
QAction *newAction = _actions->addAction(realId);
if (!newAction)
{
return 0;
return nullptr;
}
// If our HandlerType is configuration we have to tell kdedglobalaccel
// that this action is only for configuration purposes.
......@@ -96,7 +96,7 @@ QAction *ShortcutsHandler::addAction(
qWarning() << "Failed to enable global shortcut for '"
<< text << "' " << id;
_actions->removeAction(newAction);
return 0;
return nullptr;
}
Q_ASSERT(newAction->isEnabled());
......
......@@ -49,7 +49,7 @@ public:
*
* \param Should
*/
ShortcutsHandler( HandlerType type = Active, QObject *parent = 0 );
ShortcutsHandler( HandlerType type = Active, QObject *parent = nullptr );
/**
* Destructor
......
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