Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

7 files changed, 34 insertions, 34 deletions

diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp
index a2338cd67..4b3af723e 100644
--- a/tdm/kfrontend/kfdialog.cpp
+++ b/tdm/kfrontend/kfdialog.cpp
@@ -167,7 +167,7 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t
 	TQLabel *label1 = new TQLabel( this );
 	label1->setPixmap( TQMessageBox::standardIcon( type ) );
 	TQLabel *label2 = new TQLabel( text, this );
-	TQRect d = KGlobalSettings::desktopGeometry(this);
+	TQRect d = TDEGlobalSettings::desktopGeometry(this);
 	if ( label2->fontMetrics().size( 0, text).width() > d.width() * 3 / 5) 
 		label2->setAlignment(TQt::WordBreak | TQt::AlignAuto );
 	KPushButton *button = new KPushButton( KStdGuiItem::ok(), this );
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index f6a5a0b15..d6fc4fc43 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -117,7 +117,7 @@ void GreeterApp::init()
 		startTimer( pingInterval * 60000 );
 	}
 
-	TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
 }
 
@@ -202,11 +202,11 @@ kg_main( const char *argv0 )
 	TDEApplication::disableAutoDcopRegistration();
 	KCrash::setSafer( true );
 
-	KProcess *tsak = 0;
-	KProcess *proc = 0;
-	KProcess *comp = 0;
-	KProcess *dcop = 0;
-	KProcess *twin = 0;
+	TDEProcess *tsak = 0;
+	TDEProcess *proc = 0;
+	TDEProcess *comp = 0;
+	TDEProcess *dcop = 0;
+	TDEProcess *twin = 0;
 
 #ifdef BUILD_TSAK
 	trinity_desktop_lock_use_sak = _useSAK;
@@ -214,9 +214,9 @@ kg_main( const char *argv0 )
 	trinity_desktop_lock_use_sak = false;
 #endif
 	if (trinity_desktop_lock_use_sak) {
-		tsak = new KProcess;
+		tsak = new TDEProcess;
 		*tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak";
-		tsak->start(KProcess::Block, KProcess::AllOutput);
+		tsak->start(TDEProcess::Block, TDEProcess::AllOutput);
 	}
 	else {
 		remove(TSAK_FIFO_FILE);
@@ -329,7 +329,7 @@ kg_main( const char *argv0 )
 	SecureDisplay( dpy );
 	if (!_grabServer) {
 		if (_useBackground) {
-			proc = new KProcess;
+			proc = new TDEProcess;
 			*proc << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "krootimage";
 			*proc << _backgroundCfg;
 			proc->start();
@@ -339,20 +339,20 @@ kg_main( const char *argv0 )
 	}
 
 	if (!_compositor.isEmpty()) {
-		comp = new KProcess;
+		comp = new TDEProcess;
 		*comp << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _compositor.ascii();
-		comp->start(KProcess::NotifyOnExit, KProcess::Stdin);
+		comp->start(TDEProcess::NotifyOnExit, TDEProcess::Stdin);
 	}
 
 	if (!_windowManager.isEmpty()) {
 		if (_windowManager == "twin") {
 			// Special case
 			// Start DCOP...
-			dcop = new KProcess;
+			dcop = new TDEProcess;
 			*dcop << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "dcopserver" << TQCString("--suicide");
 			dcop->start();
 		}
-		twin = new KProcess;
+		twin = new TDEProcess;
 		*twin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii();
 		twin->start();
 		has_twin = true;
@@ -384,7 +384,7 @@ kg_main( const char *argv0 )
 			cmd = G_Greet;
 		}
 
-		KProcess *proc2 = 0;
+		TDEProcess *proc2 = 0;
 		app->setOverrideCursor( Qt::WaitCursor );
 		FDialog *dialog = NULL;
 #ifdef XDMCP
@@ -440,7 +440,7 @@ kg_main( const char *argv0 )
 			TQCursor::setPos(oldCursorPos.x() + primaryScreenPosition.x(), oldCursorPos.y() + primaryScreenPosition.y());
 #endif
 			if (*_preloader) {
-				proc2 = new KProcess;
+				proc2 = new TDEProcess;
 				*proc2 << _preloader;
 				proc2->start();
 			}
diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc
index b81a1cafa..dfa65a945 100644
--- a/tdm/kfrontend/sakdlg.cc
+++ b/tdm/kfrontend/sakdlg.cc
@@ -125,17 +125,17 @@ SAKDlg::SAKDlg(TQWidget *parent)
 
     installEventFilter(this);
 
-    mSAKProcess = new KProcess;
-    *mSAKProcess << "tdmtsak" << "dm";
-    connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
-    mSAKProcess->start();
+    mSATDEProcess = new TDEProcess;
+    *mSATDEProcess << "tdmtsak" << "dm";
+    connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
+    mSATDEProcess->start();
 
     TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
 }
 
-void SAKDlg::slotSAKProcessExited()
+void SAKDlg::slotSATDEProcessExited()
 {
-    int retcode = mSAKProcess->exitStatus();
+    int retcode = mSATDEProcess->exitStatus();
     if (retcode != 0) trinity_desktop_lock_use_sak = false;
     closingDown = true;
     hide();
@@ -207,7 +207,7 @@ void SAKDlg::handleInputPipe(void) {
 	inputcommand = inputcommand.replace('\n', "");
 	TQStringList commandList = TQStringList::split('\t', inputcommand, false);
 	if ((*(commandList.at(0))) == "CLOSE") {
-		mSAKProcess->kill();
+		mSATDEProcess->kill();
 	}
 	if (!closingDown) {
 		TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
@@ -221,9 +221,9 @@ void SAKDlg::handleInputPipe(void) {
 
 SAKDlg::~SAKDlg()
 {
-    if ((mSAKProcess) && (mSAKProcess->isRunning())) {
-        mSAKProcess->kill(SIGTERM);
-        delete mSAKProcess;
+    if ((mSATDEProcess) && (mSATDEProcess->isRunning())) {
+        mSATDEProcess->kill(SIGTERM);
+        delete mSATDEProcess;
     }
     if (mPipe_fd != -1) {
         closingDown = true;
diff --git a/tdm/kfrontend/sakdlg.h b/tdm/kfrontend/sakdlg.h
index a930707b1..a3ccad96e 100644
--- a/tdm/kfrontend/sakdlg.h
+++ b/tdm/kfrontend/sakdlg.h
@@ -37,7 +37,7 @@ public:
     void closeDialogForced();
 
 private slots:
-    void slotSAKProcessExited();
+    void slotSATDEProcessExited();
     void handleInputPipe();
 
 protected slots:
@@ -52,7 +52,7 @@ private:
     TQStringList layoutsList;
     TQStringList::iterator currLayout;
     int         sPid, sFd;
-    KProcess*   mSAKProcess;
+    TDEProcess*   mSATDEProcess;
     int         mPipe_fd;
     TQString mPipeFilename;
 
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index e546f62b6..c93dfbfaa 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -329,7 +329,7 @@ get_date( const char *str )
 {
 	KProcIO prc;
 	prc << "/bin/date" << "+%s" << "-d" << str;
-	prc.start( KProcess::Block, false );
+	prc.start( TDEProcess::Block, false );
 	TQString dstr;
 	if (prc.readln( dstr, false, 0 ) < 0)
 		return -1;
@@ -472,7 +472,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 {
 	setCaption(i18n("Shutdown TDE"));
 
-	bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
+	bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
 
 	TQFrame* lfrm = new TQFrame( this );
 	TQHBoxLayout* hbuttonbox;
diff --git a/tdm/kfrontend/themer/tdmlabel.cpp b/tdm/kfrontend/themer/tdmlabel.cpp
index 5239d48dc..8841eb22d 100644
--- a/tdm/kfrontend/themer/tdmlabel.cpp
+++ b/tdm/kfrontend/themer/tdmlabel.cpp
@@ -52,7 +52,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name )
 	label.prelight.present = false;
 	label.maximumWidth = -1;
 
-	const TQString locale = KGlobal::locale()->language();
+	const TQString locale = TDEGlobal::locale()->language();
 
 	// Read LABEL ID
 	TQDomNode n = node;
@@ -267,8 +267,8 @@ KdmLabel::lookupText( const TQString &t )
 	m['d'] = TQString::number( KThemedGreeter::timedDelay );
 	m['s'] = KThemedGreeter::timedUser;
 	// xgettext:no-c-format
-	KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") );
-	m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false );
+	TDEGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") );
+	m['c'] = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false );
 
 	return KMacroExpander::expandMacros( text, m );
 }
diff --git a/tdm/kfrontend/themer/tdmpixmap.cpp b/tdm/kfrontend/themer/tdmpixmap.cpp
index 7a8d1a3d2..56ece936c 100644
--- a/tdm/kfrontend/themer/tdmpixmap.cpp
+++ b/tdm/kfrontend/themer/tdmpixmap.cpp
@@ -72,7 +72,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
 				if ((_compositor.isEmpty()) || (!argb_visual_available)) {
 					// Software blend only (no compositing support)
 					// Use the preset TDM background...
-					KStandardDirs *m_pDirs = KGlobal::dirs();
+					KStandardDirs *m_pDirs = TDEGlobal::dirs();
 					KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) );
 					config->setGroup("Desktop0");
 					pixmap.normal.fullpath = m_pDirs->findResource("wallpaper", config->readPathEntry("Wallpaper"));