summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock
diff options
context:
space:
mode:
Diffstat (limited to 'kdesktop/lock')
-rw-r--r--kdesktop/lock/lockdlg.cc2
-rw-r--r--kdesktop/lock/lockprocess.cc26
-rw-r--r--kdesktop/lock/lockprocess.h6
-rw-r--r--kdesktop/lock/main.cc4
-rw-r--r--kdesktop/lock/sakdlg.cc18
-rw-r--r--kdesktop/lock/sakdlg.h4
6 files changed, 30 insertions, 30 deletions
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 005ac9913..29dc8bd9c 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -692,7 +692,7 @@ void PasswordDlg::slotStartNewSession()
// Calculate a proper size for the text.
{
TQSimpleRichText rt(qt_text, dialog->font());
- TQRect rect = KGlobalSettings::desktopGeometry(dialog);
+ TQRect rect = TDEGlobalSettings::desktopGeometry(dialog);
pref_width = rect.width() / 3;
rt.setWidth(pref_width);
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index cd8f38da1..a3f5fb56f 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -256,8 +256,8 @@ LockProcess::LockProcess()
XSelectInput( tqt_xdisplay(), tqt_xrootwin(), SubstructureNotifyMask | rootAttr.your_event_mask );
// Add non-TDE path
- KGlobal::dirs()->addResourceType("scrsav",
- KGlobal::dirs()->kde_default("apps") +
+ TDEGlobal::dirs()->addResourceType("scrsav",
+ TDEGlobal::dirs()->kde_default("apps") +
"System/ScreenSavers/");
// Add KDE specific screensaver path
@@ -268,8 +268,8 @@ LockProcess::LockProcess()
relPath=servGroup->relPath();
kdDebug(1204) << "relPath=" << relPath << endl;
}
- KGlobal::dirs()->addResourceType("scrsav",
- KGlobal::dirs()->kde_default("apps") +
+ TDEGlobal::dirs()->addResourceType("scrsav",
+ TDEGlobal::dirs()->kde_default("apps") +
relPath);
// virtual root property
@@ -356,7 +356,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
connect( mHackDelayStartupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(closeDialogAndStartHack()) );
connect( mEnsureVRootWindowSecurityTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repaintRootWindowIfNeeded()) );
connect(tqApp, TQT_SIGNAL(mouseInteraction(XEvent *)), TQT_SLOT(slotMouseActivity(XEvent *)));
- connect(&mHackProc, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(hackExited(KProcess *)));
+ connect(&mHackProc, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(hackExited(TDEProcess *)));
connect(&mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(suspend()));
#ifdef HAVE_DPMS
@@ -1684,7 +1684,7 @@ void LockProcess::stopHack()
//---------------------------------------------------------------------------
//
-void LockProcess::hackExited(KProcess *)
+void LockProcess::hackExited(TDEProcess *)
{
// Hack exited while we're supposed to be saving the screen.
// Make sure the saver window is black.
@@ -1831,11 +1831,11 @@ bool LockProcess::checkPass()
if (trinity_desktop_lock_use_sak) {
// Verify SAK operational status
- KProcess* checkSAKProcess = new KProcess;
- *checkSAKProcess << "tdmtsak" << "check";
- checkSAKProcess->start(KProcess::Block, KProcess::NoCommunication);
- int retcode = checkSAKProcess->exitStatus();
- delete checkSAKProcess;
+ TDEProcess* checkSATDEProcess = new TDEProcess;
+ *checkSATDEProcess << "tdmtsak" << "check";
+ checkSATDEProcess->start(TDEProcess::Block, TDEProcess::NoCommunication);
+ int retcode = checkSATDEProcess->exitStatus();
+ delete checkSATDEProcess;
if (retcode != 0) {
trinity_desktop_lock_use_sak = false;
}
@@ -1903,7 +1903,7 @@ int LockProcess::execDialog( TQDialog *dlg )
dlg->adjustSize();
TQRect rect = dlg->geometry();
- rect.moveCenter(KGlobalSettings::desktopGeometry(TQCursor::pos()).center());
+ rect.moveCenter(TDEGlobalSettings::desktopGeometry(TQCursor::pos()).center());
dlg->move( rect.topLeft() );
if (mDialogs.isEmpty())
@@ -2352,7 +2352,7 @@ void LockProcess::showVkbd()
mVkbdLastEventWindow = None;
mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS );
connect( mKWinModule, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId )));
- mVkbdProcess = new KProcess;
+ mVkbdProcess = new TDEProcess;
*mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm";
mVkbdProcess->start();
}
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index c5b72de80..1694a0eb4 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -86,7 +86,7 @@ protected:
virtual void resizeEvent(TQResizeEvent *);
private slots:
- void hackExited(KProcess *);
+ void hackExited(TDEProcess *);
void signalPipeSignal();
bool startLock();
void suspend();
@@ -136,7 +136,7 @@ private:
int mLockGrace;
int mPriority;
bool mBusy;
- KProcess mHackProc;
+ TDEProcess mHackProc;
int mRootWidth;
int mRootHeight;
TQString mSaverExec;
@@ -168,7 +168,7 @@ private:
TQTimer *hackResumeTimer;
- KProcess* mVkbdProcess;
+ TDEProcess* mVkbdProcess;
KWinModule* mKWinModule;
struct VkbdWindow
{
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 89e29a5c0..7f3f61cfd 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -231,7 +231,7 @@ int main( int argc, char **argv )
int parent_connection = 0; // socket to the parent saver
TQValueList<int> child_sockets;
- if (KGlobalSettings::isMultiHead())
+ if (TDEGlobalSettings::isMultiHead())
{
Display *dpy = XOpenDisplay(NULL);
if (! dpy) {
@@ -290,7 +290,7 @@ int main( int argc, char **argv )
MyApp app;
kdDebug() << "app " << kdesktop_screen_number << " " << starting_screen << " " << child << " " << child_sockets.count() << " " << parent_connection << endl;
app.disableSessionManagement();
- KGlobal::locale()->insertCatalogue("libdmctl");
+ TDEGlobal::locale()->insertCatalogue("libdmctl");
struct stat st;
KSimpleConfig* tdmconfig;
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc
index a79d0e508..6f983ce70 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cc
@@ -104,24 +104,24 @@ SAKDlg::SAKDlg(LockProcess *parent)
installEventFilter(this);
setFixedSize( sizeHint() );
- mSAKProcess = new KProcess;
- *mSAKProcess << "tdmtsak";
- connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
- mSAKProcess->start();
+ mSATDEProcess = new TDEProcess;
+ *mSATDEProcess << "tdmtsak";
+ connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
+ mSATDEProcess->start();
}
-void SAKDlg::slotSAKProcessExited()
+void SAKDlg::slotSATDEProcessExited()
{
- int retcode = mSAKProcess->exitStatus();
+ int retcode = mSATDEProcess->exitStatus();
if (retcode != 0) trinity_desktop_lock_use_sak = false;
hide();
}
SAKDlg::~SAKDlg()
{
- if ((mSAKProcess) && (mSAKProcess->isRunning())) {
- mSAKProcess->kill(SIGTERM);
- delete mSAKProcess;
+ if ((mSATDEProcess) && (mSATDEProcess->isRunning())) {
+ mSATDEProcess->kill(SIGTERM);
+ delete mSATDEProcess;
}
hide();
}
diff --git a/kdesktop/lock/sakdlg.h b/kdesktop/lock/sakdlg.h
index d72f8d46e..7bc8d1fab 100644
--- a/kdesktop/lock/sakdlg.h
+++ b/kdesktop/lock/sakdlg.h
@@ -37,7 +37,7 @@ public:
void closeDialogForced();
private slots:
- void slotSAKProcessExited();
+ void slotSATDEProcessExited();
protected slots:
virtual void reject();
@@ -51,7 +51,7 @@ private:
TQStringList layoutsList;
TQStringList::iterator currLayout;
int sPid, sFd;
- KProcess* mSAKProcess;
+ TDEProcess* mSATDEProcess;
};
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 19:11:39 +0000