diff options
| author | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdeui/kpushbutton.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeui/kpushbutton.cpp')
| -rw-r--r-- | tdeui/kpushbutton.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp index 07127cdc8..6f994dbe3 100644 --- a/tdeui/kpushbutton.cpp +++ b/tdeui/kpushbutton.cpp @@ -25,11 +25,11 @@ #include "config.h" -#include <kglobalsettings.h> -#include <kconfig.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeconfig.h> +#include <tdeglobal.h> #include <kipc.h> -#include <kapplication.h> +#include <tdeapplication.h> class KPushButton::KPushButtonPrivate { @@ -114,7 +114,7 @@ void KPushButton::init( const KGuiItem &item ) void KPushButton::readSettings() { - s_useIcons = KGlobalSettings::showIconsOnPushButtons(); + s_useIcons = TDEGlobalSettings::showIconsOnPushButtons(); } void KPushButton::setGuiItem( const KGuiItem& item ) @@ -195,7 +195,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e ) if ( (e->state() & Qt::LeftButton) && (e->pos() - startPos).manhattanLength() > - KGlobalSettings::dndEventDelay() ) + TDEGlobalSettings::dndEventDelay() ) { startDrag(); setDown( false ); |