summaryrefslogtreecommitdiffstats
path: root/kcontrol/screensaver
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/screensaver')
-rw-r--r--kcontrol/screensaver/advanceddialog.cpp24
-rw-r--r--kcontrol/screensaver/advanceddialog.h2
-rw-r--r--kcontrol/screensaver/kswidget.h2
-rw-r--r--kcontrol/screensaver/saverconfig.cpp4
-rw-r--r--kcontrol/screensaver/scrnsave.cpp103
-rw-r--r--kcontrol/screensaver/scrnsave.h4
-rw-r--r--kcontrol/screensaver/testwin.cpp2
-rw-r--r--kcontrol/screensaver/testwin.h2
8 files changed, 77 insertions, 66 deletions
diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp
index 7a28178d5..ca4bbfae6 100644
--- a/kcontrol/screensaver/advanceddialog.cpp
+++ b/kcontrol/screensaver/advanceddialog.cpp
@@ -1,5 +1,5 @@
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqcombobox.h>
#include <kdebug.h>
@@ -24,17 +24,17 @@ KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(TQWidget *parent, const c
readSettings();
- connect(dialog->qcbPriority, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotPriorityChanged(int)));
-
- connect(dialog->qcbTopLeft, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotChangeTopLeftCorner(int)));
- connect(dialog->qcbTopRight, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotChangeTopLeftCorner(int)));
- connect(dialog->qcbBottomLeft, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotChangeTopLeftCorner(int)));
- connect(dialog->qcbBottomRight, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotChangeTopLeftCorner(int)));
+ connect(dialog->qcbPriority, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotPriorityChanged(int)));
+
+ connect(dialog->qcbTopLeft, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotChangeTopLeftCorner(int)));
+ connect(dialog->qcbTopRight, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotChangeTopLeftCorner(int)));
+ connect(dialog->qcbBottomLeft, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotChangeTopLeftCorner(int)));
+ connect(dialog->qcbBottomRight, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotChangeTopLeftCorner(int)));
#ifndef HAVE_SETPRIORITY
dialog->qgbPriority->setEnabled(false);
diff --git a/kcontrol/screensaver/advanceddialog.h b/kcontrol/screensaver/advanceddialog.h
index 87ee03a31..4ddb9abc7 100644
--- a/kcontrol/screensaver/advanceddialog.h
+++ b/kcontrol/screensaver/advanceddialog.h
@@ -27,7 +27,7 @@ public:
class KScreenSaverAdvancedDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KScreenSaverAdvancedDialog(TQWidget *parent, const char* name = 0);
diff --git a/kcontrol/screensaver/kswidget.h b/kcontrol/screensaver/kswidget.h
index 11ec33a74..4c96daf41 100644
--- a/kcontrol/screensaver/kswidget.h
+++ b/kcontrol/screensaver/kswidget.h
@@ -6,7 +6,7 @@
class KSWidget : public QXEmbed
{
- Q_OBJECT
+ TQ_OBJECT
public:
KSWidget( TQWidget *parent = NULL, const char* name = NULL, int flags = 0 );
virtual ~KSWidget();
diff --git a/kcontrol/screensaver/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp
index 75ee227f1..f85740911 100644
--- a/kcontrol/screensaver/saverconfig.cpp
+++ b/kcontrol/screensaver/saverconfig.cpp
@@ -1,4 +1,4 @@
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <tdelocale.h>
#include "saverconfig.h"
@@ -9,7 +9,7 @@ SaverConfig::SaverConfig()
bool SaverConfig::read(const TQString &file)
{
- KDesktopFile config(file, true);
+ TDEDesktopFile config(file, true);
if( !config.tryExec())
return false;
mExec = config.readPathEntry("Exec");
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index b66f7bbd6..c639bba4e 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -40,10 +40,10 @@
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <knuminput.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kservicegroup.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
#include <X11/Xlib.h>
#include "scrnsave.h"
@@ -84,10 +84,10 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
struct stat st;
if( stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st ) == 0) {
- mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
+ mTDMConfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
}
else {
- mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
+ mTDMConfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
}
mTDMConfig->setGroup("X-:*-Greeter");
@@ -124,12 +124,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
readSettings( false );
mSetupProc = new TDEProcess;
- connect(mSetupProc, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(slotSetupDone(TDEProcess *)));
+ connect(mSetupProc, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(slotSetupDone(TDEProcess *)));
mPreviewProc = new TDEProcess;
- connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(slotPreviewExited(TDEProcess *)));
+ connect(mPreviewProc, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(slotPreviewExited(TDEProcess *)));
TQBoxLayout *topLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
@@ -140,7 +140,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
new TQVBoxLayout(leftColumnLayout, KDialog::spacingHint());
mSaverGroup = new TQGroupBox(i18n("Screen Saver"), this );
- mSaverGroup->setColumnLayout( 0, Qt::Horizontal );
+ mSaverGroup->setColumnLayout( 0, TQt::Horizontal );
vLayout->addWidget(mSaverGroup);
vLayout->setStretchFactor( mSaverGroup, 10 );
TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(),
@@ -153,31 +153,31 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mSaverListView->header()->hide();
mSelected = -1;
groupLayout->addWidget( mSaverListView, 10 );
- connect( mSaverListView, TQT_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotSetup()));
+ connect( mSaverListView, TQ_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQ_SLOT( slotSetup()));
TQWhatsThis::add( mSaverListView, i18n("Select the screen saver to use.") );
TQBoxLayout* hlay = new TQHBoxLayout(groupLayout, KDialog::spacingHint());
mSetupBt = new TQPushButton( i18n("&Setup..."), mSaverGroup );
- connect( mSetupBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetup() ) );
+ connect( mSetupBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSetup() ) );
mSetupBt->setEnabled(false);
hlay->addWidget( mSetupBt );
TQWhatsThis::add( mSetupBt, i18n("Configure the screen saver's options, if any.") );
mTestBt = new TQPushButton( i18n("&Test"), mSaverGroup );
- connect( mTestBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotTest() ) );
+ connect( mTestBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotTest() ) );
mTestBt->setEnabled(false);
hlay->addWidget( mTestBt );
TQWhatsThis::add( mTestBt, i18n("Show a full screen preview of the screen saver.") );
mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
- mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
+ mSettingsGroup->setColumnLayout( 0, TQt::Vertical );
leftColumnLayout->addWidget( mSettingsGroup );
TQGridLayout *settingsGroupLayout = new TQGridLayout( mSettingsGroup->layout(), 5, 2, KDialog::spacingHint() );
mEnabledCheckBox = new TQCheckBox(i18n("Start a&utomatically"), mSettingsGroup);
mEnabledCheckBox->setChecked(mEnabled);
TQWhatsThis::add( mEnabledCheckBox, i18n("Automatically start the screen saver after a period of inactivity.") );
- connect(mEnabledCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnable(bool)));
+ connect(mEnabledCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnable(bool)));
settingsGroupLayout->addWidget(mEnabledCheckBox, 0, 0);
TQBoxLayout *hbox = new TQHBoxLayout();
@@ -192,8 +192,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mWaitEdit->setSuffix(i18n(" min"));
mWaitEdit->setValue(mTimeout/60);
mWaitEdit->setEnabled(mEnabled);
- connect(mWaitEdit, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotTimeoutChanged(int)));
+ connect(mWaitEdit, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotTimeoutChanged(int)));
mActivateLbl->setBuddy(mWaitEdit);
hbox->addWidget(mWaitEdit);
hbox->addStretch(1);
@@ -204,7 +204,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mLockCheckBox = new TQCheckBox( i18n("&Require password to stop"), mSettingsGroup );
mLockCheckBox->setEnabled( mEnabled );
mLockCheckBox->setChecked( mLock );
- connect( mLockCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotLock( bool ) ) );
+ connect( mLockCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotLock( bool ) ) );
settingsGroupLayout->addWidget(mLockCheckBox, 2, 0);
TQWhatsThis::add( mLockCheckBox, i18n("Prevent potential unauthorized use by requiring a password to stop the screen saver.") );
@@ -230,7 +230,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
}
- connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLockTimeoutChanged(int)));
+ connect(mWaitLockEdit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotLockTimeoutChanged(int)));
mLockLbl->setBuddy(mWaitLockEdit);
hbox->addWidget(mWaitLockEdit);
hbox->addStretch(1);
@@ -241,35 +241,35 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mDelaySaverStartCheckBox = new TQCheckBox( i18n("&Delay saver start after lock"), mSettingsGroup );
mDelaySaverStartCheckBox->setEnabled( true );
mDelaySaverStartCheckBox->setChecked( mDelaySaverStart );
- connect( mDelaySaverStartCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotDelaySaverStart( bool ) ) );
+ connect( mDelaySaverStartCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotDelaySaverStart( bool ) ) );
settingsGroupLayout->addWidget(mDelaySaverStartCheckBox, 0, 1);
TQWhatsThis::add( mDelaySaverStartCheckBox, i18n("When manually locking the screen, wait to start the screen saver until the configured start delay has elapsed.") );
mUseTSAKCheckBox = new TQCheckBox( i18n("&Use Secure Attention Key"), mSettingsGroup );
mUseTSAKCheckBox->setEnabled( true );
mUseTSAKCheckBox->setChecked( mUseTSAK );
- connect( mUseTSAKCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseTSAK( bool ) ) );
+ connect( mUseTSAKCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseTSAK( bool ) ) );
settingsGroupLayout->addWidget(mUseTSAKCheckBox, 1, 1);
TQWhatsThis::add( mUseTSAKCheckBox, i18n("Require Secure Attention Key prior to displaying the unlock dialog.") );
mUseUnmanagedLockWindowsCheckBox = new TQCheckBox( i18n("Use &legacy lock windows"), mSettingsGroup );
mUseUnmanagedLockWindowsCheckBox->setEnabled( true );
mUseUnmanagedLockWindowsCheckBox->setChecked( mUseUnmanagedLockWindows );
- connect( mUseUnmanagedLockWindowsCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseUnmanagedLockWindows( bool ) ) );
+ connect( mUseUnmanagedLockWindowsCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseUnmanagedLockWindows( bool ) ) );
settingsGroupLayout->addWidget(mUseUnmanagedLockWindowsCheckBox, 2, 1);
TQWhatsThis::add( mUseUnmanagedLockWindowsCheckBox, i18n("Use old-style unmanaged X11 lock windows.") );
mHideActiveWindowsFromSaverCheckBox = new TQCheckBox( i18n("Hide active &windows from saver"), mSettingsGroup );
mHideActiveWindowsFromSaverCheckBox->setEnabled( true );
mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );
- connect( mHideActiveWindowsFromSaverCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotHideActiveWindowsFromSaver( bool ) ) );
+ connect( mHideActiveWindowsFromSaverCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotHideActiveWindowsFromSaver( bool ) ) );
settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);
TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );
mHideCancelButtonCheckBox = new TQCheckBox( i18n("Hide &cancel button"), mSettingsGroup );
mHideCancelButtonCheckBox->setEnabled( true );
mHideCancelButtonCheckBox->setChecked( mHideCancelButton );
- connect( mHideCancelButtonCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotHideCancelButton(bool)) );
+ connect( mHideCancelButtonCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotHideCancelButton(bool)) );
settingsGroupLayout->addWidget(mHideCancelButtonCheckBox, 4, 1);
TQWhatsThis::add(mHideCancelButtonCheckBox, i18n("Hide Cancel button from the \"Desktop Session Locked\" dialog."));
@@ -288,8 +288,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
i18n( "Advanced &Options" ), this, "advancedBtn" );
advancedBt->setSizePolicy( TQSizePolicy(
TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
- connect( advancedBt, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotAdvanced() ) );
+ connect( advancedBt, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotAdvanced() ) );
advancedLayout->addWidget( advancedBt );
advancedLayout->addWidget( new TQWidget( this ) );
@@ -306,7 +306,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
// we've started up.
mNumLoaded = 0;
mLoadTimer = new TQTimer( this );
- connect( mLoadTimer, TQT_SIGNAL(timeout()), TQT_SLOT(findSavers()) );
+ connect( mLoadTimer, TQ_SIGNAL(timeout()), TQ_SLOT(findSavers()) );
mLoadTimer->start( 100 );
mChanged = false;
emit changed(false);
@@ -497,7 +497,7 @@ void KScreenSaver::save()
// TODO (GJ): When you changed anything, these two lines will give a segfault
// on exit. I don't know why yet.
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
client->send("kdesktop", "KScreensaverIface", "configure()", TQString(""));
mChanged = false;
@@ -523,28 +523,39 @@ void KScreenSaver::findSavers()
i++, mNumLoaded++ ) {
TQString file = mSaverFileList[mNumLoaded];
SaverConfig *saver = new SaverConfig;
- if (saver->read(file)) {
- TQString saverexec = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(saver->exec());
+ bool saverFound = false;
+ if (saver->read(file))
+ {
// find the xscreensaver executable
//work around a TDEStandardDirs::findExe() "feature" where it looks in $TDEDIR/bin first no matter what and sometimes finds the wrong executable
TQFileInfo checkExe;
- checkExe.setFile(saverexec);
- if (checkExe.exists() && checkExe.isExecutable() && checkExe.isFile()) {
- mSaverList.append(saver);
+ TQStringList saverPaths = TQStringList::split(':', XSCREENSAVER_HACKS_DIRS);
+ for (TQStringList::ConstIterator it = saverPaths.begin(); it != saverPaths.end(); ++it)
+ {
+ checkExe.setFile((*it) + "/" + saver->exec());
+ if (checkExe.exists() && checkExe.isExecutable() && checkExe.isFile())
+ {
+ mSaverList.append(saver);
+ saverFound = true;
+ break;
+ }
}
- else {
+
+ if (!saverFound)
+ {
// Executable not present in XScreenSaver directory!
// Try standard paths
- if (TDEStandardDirs::findExe(saver->exec()) != TQString::null) {
+ if (TDEStandardDirs::findExe(saver->exec()) != TQString::null)
+ {
mSaverList.append(saver);
- }
- else {
- delete saver;
+ saverFound = true;
}
}
}
- else {
- delete saver;
+
+ if (!saverFound)
+ {
+ delete saver;
}
}
@@ -604,8 +615,8 @@ void KScreenSaver::findSavers()
mTestBt->setEnabled(true);
}
- connect( mSaverListView, TQT_SIGNAL( currentChanged( TQListViewItem * ) ),
- this, TQT_SLOT( slotScreenSaver( TQListViewItem * ) ) );
+ connect( mSaverListView, TQ_SIGNAL( currentChanged( TQListViewItem * ) ),
+ this, TQ_SLOT( slotScreenSaver( TQListViewItem * ) ) );
setMonitor();
}
@@ -831,7 +842,7 @@ void KScreenSaver::slotSetup()
}
mSetupBt->setEnabled( false );
- kapp->flushX();
+ tdeApp->flushX();
mSetupProc->start();
}
@@ -875,8 +886,8 @@ void KScreenSaver::slotTest()
{
mTestWin = new TestWin();
mTestWin->setBackgroundMode(TQWidget::NoBackground);
- mTestWin->setGeometry(0, 0, kapp->desktop()->width(),
- kapp->desktop()->height());
+ mTestWin->setGeometry(0, 0, tdeApp->desktop()->width(),
+ tdeApp->desktop()->height());
}
mTestWin->show();
@@ -888,7 +899,7 @@ void KScreenSaver::slotTest()
grabMouse();
grabKeyboard();
- mTestBt->setEnabled( FALSE );
+ mTestBt->setEnabled( false );
mPreviewProc->kill();
while (!ts.atEnd())
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index d52c81227..f7953f1e4 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -33,7 +33,7 @@ class TDEProcess;
//===========================================================================
class KScreenSaver : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KScreenSaver(TQWidget *parent, const char *name, const TQStringList &);
~KScreenSaver();
@@ -125,7 +125,7 @@ protected:
bool mHideActiveWindowsFromSaver;
bool mHideCancelButton;
- KSimpleConfig* mTDMConfig;
+ TDESimpleConfig* mTDMConfig;
};
#endif
diff --git a/kcontrol/screensaver/testwin.cpp b/kcontrol/screensaver/testwin.cpp
index dd250e084..1055701f1 100644
--- a/kcontrol/screensaver/testwin.cpp
+++ b/kcontrol/screensaver/testwin.cpp
@@ -6,7 +6,7 @@ class QXEmbed;
TestWin::TestWin()
: KSWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM )
{
- setFocusPolicy(TQ_StrongFocus);
+ setFocusPolicy(TQWidget::StrongFocus);
KWin::setState( winId(), NET::StaysOnTop );
}
diff --git a/kcontrol/screensaver/testwin.h b/kcontrol/screensaver/testwin.h
index ff77b6b4d..a59dcd7e7 100644
--- a/kcontrol/screensaver/testwin.h
+++ b/kcontrol/screensaver/testwin.h
@@ -5,7 +5,7 @@
class TestWin : public KSWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
TestWin();
};
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 15:34:29 +0000