diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:42:09 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:42:09 -0600 |
| commit | b1b005cf854aad925c2e64c3fc3ece582d4bffcf (patch) | |
| tree | 53d452bd876320e4462a2a6ab4fa51b0111d8c02 /kscreensaver/kxsconfig | |
| parent | 36117c8a3e07af8406a8e3c05748a785d6e53078 (diff) | |
| download | tdeartwork-b1b005cf854aad925c2e64c3fc3ece582d4bffcf.tar.gz tdeartwork-b1b005cf854aad925c2e64c3fc3ece582d4bffcf.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kscreensaver/kxsconfig')
| -rw-r--r-- | kscreensaver/kxsconfig/kxsconfig.cpp | 8 | ||||
| -rw-r--r-- | kscreensaver/kxsconfig/kxsconfig.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp index b3de5e45..a085d032 100644 --- a/kscreensaver/kxsconfig/kxsconfig.cpp +++ b/kscreensaver/kxsconfig/kxsconfig.cpp @@ -165,9 +165,9 @@ bool KXSConfigDialog::create() } } - mPreviewProc = new KProcess; - connect(mPreviewProc, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(slotPreviewExited(KProcess *))); + mPreviewProc = new TDEProcess; + connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(slotPreviewExited(TDEProcess *))); mPreviewTimer = new TQTimer(this); connect(mPreviewTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNewPreview())); @@ -213,7 +213,7 @@ TQString KXSConfigDialog::command() } //--------------------------------------------------------------------------- -void KXSConfigDialog::slotPreviewExited(KProcess *) +void KXSConfigDialog::slotPreviewExited(TDEProcess *) { if ( mKilled ) { mKilled = false; diff --git a/kscreensaver/kxsconfig/kxsconfig.h b/kscreensaver/kxsconfig/kxsconfig.h index de88df23..daf3c9f8 100644 --- a/kscreensaver/kxsconfig/kxsconfig.h +++ b/kscreensaver/kxsconfig/kxsconfig.h @@ -25,7 +25,7 @@ #include <kdialogbase.h> #include "kxsitem.h" -class KProcess; +class TDEProcess; class TQLabel; class KXSConfigDialog : public KDialogBase @@ -40,7 +40,7 @@ public: TQString command(); protected slots: - void slotPreviewExited(KProcess *); + void slotPreviewExited(TDEProcess *); void slotNewPreview(); void slotChanged(); virtual void slotOk(); @@ -50,7 +50,7 @@ protected: TQString mFilename; TQString mExeName; TQString mConfigFile; - KProcess *mPreviewProc; + TDEProcess *mPreviewProc; TQWidget *mPreview; TQTimer *mPreviewTimer; TQPtrList<KXSConfigItem> mConfigItemList; |