summaryrefslogtreecommitdiffstats
path: root/kcontrol/screensaver
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/screensaver
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/screensaver')
-rw-r--r--kcontrol/screensaver/scrnsave.cpp30
-rw-r--r--kcontrol/screensaver/scrnsave.h12
2 files changed, 21 insertions, 21 deletions
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index 85d1aa628..c9f1e8f2b 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -82,8 +82,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mTesting = false;
// Add non-TDE path
- KGlobal::dirs()->addResourceType("scrsav",
- KGlobal::dirs()->kde_default("apps") +
+ TDEGlobal::dirs()->addResourceType("scrsav",
+ TDEGlobal::dirs()->kde_default("apps") +
"apps/ScreenSavers/");
setQuickHelp( i18n("<h1>Screen Saver</h1> This module allows you to enable and"
@@ -107,19 +107,19 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
kdDebug() << "relPath=" << relPath << endl;
}
- KGlobal::dirs()->addResourceType("scrsav",
- KGlobal::dirs()->kde_default("apps") +
+ TDEGlobal::dirs()->addResourceType("scrsav",
+ TDEGlobal::dirs()->kde_default("apps") +
relPath);
readSettings( false );
- mSetupProc = new KProcess;
- connect(mSetupProc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotSetupDone(KProcess *)));
+ mSetupProc = new TDEProcess;
+ connect(mSetupProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotSetupDone(TDEProcess *)));
- mPreviewProc = new KProcess;
- connect(mPreviewProc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotPreviewExited(KProcess *)));
+ mPreviewProc = new TDEProcess;
+ connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotPreviewExited(TDEProcess *)));
TQBoxLayout *topLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
@@ -465,7 +465,7 @@ void KScreenSaver::save()
void KScreenSaver::findSavers()
{
if ( !mNumLoaded ) {
- mSaverFileList = KGlobal::dirs()->findAllResources("scrsav",
+ mSaverFileList = TDEGlobal::dirs()->findAllResources("scrsav",
"*.desktop", false, true);
new TQListViewItem ( mSaverListView, i18n("Loading...") );
if ( mSaverFileList.isEmpty() )
@@ -562,7 +562,7 @@ void KScreenSaver::setMonitor()
//---------------------------------------------------------------------------
//
-void KScreenSaver::slotPreviewExited(KProcess *)
+void KScreenSaver::slotPreviewExited(TDEProcess *)
{
// Ugly hack to prevent continual respawning of savers that crash
if (mSelected == mPrevSelected)
@@ -754,7 +754,7 @@ void KScreenSaver::slotTest()
return;
if (!mTestProc) {
- mTestProc = new KProcess;
+ mTestProc = new TDEProcess;
}
mTestProc->clearArguments();
@@ -800,7 +800,7 @@ void KScreenSaver::slotTest()
}
mTesting = true;
- mTestProc->start(KProcess::NotifyOnExit);
+ mTestProc->start(TDEProcess::NotifyOnExit);
}
}
@@ -851,7 +851,7 @@ void KScreenSaver::slotLock( bool l )
//---------------------------------------------------------------------------
//
-void KScreenSaver::slotSetupDone(KProcess *)
+void KScreenSaver::slotSetupDone(TDEProcess *)
{
mPrevSelected = -1; // see ugly hack in slotPreviewExited()
setMonitor();
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index 9dcf7f46e..afaa3450b 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -28,7 +28,7 @@ class TQListView;
class TQListViewItem;
class TQPushButton;
class KIntNumInput;
-class KProcess;
+class TDEProcess;
//===========================================================================
class KScreenSaver : public KCModule
@@ -56,11 +56,11 @@ protected slots:
void slotTimeoutChanged( int );
void slotLockTimeoutChanged( int );
void slotLock( bool );
- void slotSetupDone(KProcess*);
+ void slotSetupDone(TDEProcess*);
// when selecting a new screensaver, the old preview will
// be killed. -- This callback is responsible for restarting the
// new preview
- void slotPreviewExited(KProcess *);
+ void slotPreviewExited(TDEProcess *);
void findSavers();
protected:
@@ -74,9 +74,9 @@ protected:
protected:
TestWin *mTestWin;
- KProcess *mTestProc;
- KProcess *mSetupProc;
- KProcess *mPreviewProc;
+ TDEProcess *mTestProc;
+ TDEProcess *mSetupProc;
+ TDEProcess *mPreviewProc;
KSSMonitor *mMonitor;
TQPushButton *mSetupBt;
TQPushButton *mTestBt;