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

9 files changed, 18 insertions, 18 deletions

diff --git a/atlantik/ChangeLog b/atlantik/ChangeLog
index 8f889261..a6b10b98 100644
--- a/atlantik/ChangeLog
+++ b/atlantik/ChangeLog
@@ -106,7 +106,7 @@
 
 - fixed potential double initialization of gameboard
 - don't crash when removing money from a trade
-- properly quote arguments given to KProcess in kio_atlantik
+- properly quote arguments given to TDEProcess in kio_atlantik
 - valgrind leak and unitialised memory access fixes
 
 0.5.0
diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index 8cd33f2c..fbdba102 100644
--- a/atlantik/client/atlantik.cpp
+++ b/atlantik/client/atlantik.cpp
@@ -147,7 +147,7 @@ Atlantik::Atlantik ()
 
 	// Mix code and XML into GUI
 	KMainWindow::createGUI();
-	applyMainWindowSettings( KGlobal::config(), "AtlantikMainWindow" );
+	applyMainWindowSettings( TDEGlobal::config(), "AtlantikMainWindow" );
 	KMainWindow::statusBar()->insertItem("Atlantik " ATLANTIK_VERSION_STRING, 0);
 	KMainWindow::statusBar()->insertItem(TQString(), 1);
 	connect(statusBar(), TQT_SIGNAL(released(int)), TQT_TQOBJECT(this), TQT_SLOT(statusBarClick(int)));
diff --git a/atlantik/client/main.cpp b/atlantik/client/main.cpp
index ec677a57..21a3f0ed 100644
--- a/atlantik/client/main.cpp
+++ b/atlantik/client/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
 
 	TDEApplication::addCmdLineOptions();
 	TDEApplication kapplication;
-    KGlobal::locale()->insertCatalogue("libtdegames");
+    TDEGlobal::locale()->insertCatalogue("libtdegames");
 
 	if (kapplication.isRestored())
 		RESTORE(Atlantik)
diff --git a/atlantik/kio_atlantik/kio_atlantik.cpp b/atlantik/kio_atlantik/kio_atlantik.cpp
index 95eca5fa..d999e51b 100644
--- a/atlantik/kio_atlantik/kio_atlantik.cpp
+++ b/atlantik/kio_atlantik/kio_atlantik.cpp
@@ -45,11 +45,11 @@ extern "C"
 
 void AtlantikProtocol::get( const KURL& url )
 {
-	KProcess *proc = new KProcess;
+	TDEProcess *proc = new TDEProcess;
 	*proc << "atlantik";
 
 #ifdef KDE_3_1_FEATURES
-	TQString host = url.hasHost() ? url.host() : KProcess::quote( url.queryItem("host") );
+	TQString host = url.hasHost() ? url.host() : TDEProcess::quote( url.queryItem("host") );
 #else
 	TQString host = url.hasHost() ? url.host() : url.queryItem("host");
 #endif
@@ -64,7 +64,7 @@ void AtlantikProtocol::get( const KURL& url )
 			*proc << "--game" << gameString;
 	}
 
-	proc->start(KProcess::DontCare);
+	proc->start(TDEProcess::DontCare);
 	proc->detach();
 	finished();
 }
diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp
index 4a601ddf..e4e52ea1 100644
--- a/atlantik/libatlantikui/estatedetails.cpp
+++ b/atlantik/libatlantikui/estatedetails.cpp
@@ -174,11 +174,11 @@ void EstateDetails::paintEvent(TQPaintEvent *)
 
 			// Estate name
 			painter.setPen(TQt::white);
-			int fontSize = KGlobalSettings::generalFont().pointSize();
+			int fontSize = TDEGlobalSettings::generalFont().pointSize();
 			if (fontSize == -1)
-				fontSize = KGlobalSettings::generalFont().pixelSize();
+				fontSize = TDEGlobalSettings::generalFont().pixelSize();
 
-			painter.setFont(TQFont(KGlobalSettings::generalFont().family(), fontSize * 2, TQFont::Bold));
+			painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), fontSize * 2, TQFont::Bold));
 			painter.drawText(KDialog::marginHint(), KDialog::marginHint(), width()-KDialog::marginHint(), titleHeight, TQt::AlignJustify, m_estate->name());
 
 			painter.setPen(TQt::black);
@@ -189,12 +189,12 @@ void EstateDetails::paintEvent(TQPaintEvent *)
 			if (m_estate->estateGroup())
 			{
 				xText = titleHeight - fontSize - KDialog::marginHint();
-				painter.setFont(TQFont(KGlobalSettings::generalFont().family(), fontSize, TQFont::Bold));
+				painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), fontSize, TQFont::Bold));
 				painter.drawText(5, xText, width()-10, titleHeight, TQt::AlignRight, m_estate->estateGroup()->name().upper());
 			}
 
 			xText = titleHeight + fontSize + 5;
-			painter.setFont(TQFont(KGlobalSettings::generalFont().family(), fontSize, TQFont::Normal));
+			painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), fontSize, TQFont::Normal));
 		}
 		b_recreate = false;
 
diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp
index 407f80e3..a9f4b83d 100644
--- a/atlantik/libatlantikui/estateview.cpp
+++ b/atlantik/libatlantikui/estateview.cpp
@@ -401,7 +401,7 @@ void EstateView::paintEvent(TQPaintEvent *)
 			delete quartzBuffer;
 		}
 
-		TQFont font = TQFont( KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::Normal );
+		TQFont font = TQFont( TDEGlobalSettings::generalFont().family(), TDEGlobalSettings::generalFont().pointSize(), TQFont::Normal );
 		painter.setFont(font);
 		TQString estateName = m_estate->name();
 #if defined(TDE_MAKE_VERSION)
diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
index 38c0d636..eb0a0d9e 100644
--- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp
+++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
@@ -64,7 +64,7 @@ void KWrappedListViewItem::wrapColumn( int c )
 	if ( !lv )
 		return;
 
-	TQFont font = TQFont( KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::Normal );
+	TQFont font = TQFont( TDEGlobalSettings::generalFont().family(), TDEGlobalSettings::generalFont().pointSize(), TQFont::Normal );
 	TQFontMetrics fm = TQFontMetrics( font );
 
 	int wrapWidth = lv->width();
diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp
index 1cd6d2e8..df24c6df 100644
--- a/atlantik/libatlantikui/portfolioview.cpp
+++ b/atlantik/libatlantikui/portfolioview.cpp
@@ -216,7 +216,7 @@ void PortfolioView::paintEvent(TQPaintEvent *)
 		}
 
 		painter.setPen(TQt::white);
-		painter.setFont(TQFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::Bold));
+		painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), TDEGlobalSettings::generalFont().pointSize(), TQFont::Bold));
 		painter.drawText(ICONSIZE + KDialog::marginHint(), 15, m_player->name());
 
 		if ( m_portfolioEstates.count() )
@@ -226,7 +226,7 @@ void PortfolioView::paintEvent(TQPaintEvent *)
 			painter.setPen(TQt::black);
 			painter.setBrush(TQt::white);
 
-			painter.setFont(TQFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::Normal));
+			painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), TDEGlobalSettings::generalFont().pointSize(), TQFont::Normal));
 			painter.drawText(ICONSIZE + KDialog::marginHint(), 30, m_player->host());
 		}
 
diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp
index bb60e5ed..81cad373 100644
--- a/atlantik/libatlantikui/token.cpp
+++ b/atlantik/libatlantikui/token.cpp
@@ -53,7 +53,7 @@ Token::Token(Player *player, AtlantikBoard *parent, const char *name) : TQWidget
 	m_image = 0;
 	loadIcon();
 
-	setFixedSize(TQSize(TOKEN_ICONSIZE, TOKEN_ICONSIZE + KGlobalSettings::generalFont().pointSize()));
+	setFixedSize(TQSize(TOKEN_ICONSIZE, TOKEN_ICONSIZE + TDEGlobalSettings::generalFont().pointSize()));
 }
 
 Token::~Token()
@@ -140,10 +140,10 @@ void Token::paintEvent(TQPaintEvent *)
 
 		painter.setPen(TQt::black);
 		painter.setBrush(TQt::black);
-		painter.drawRect(0, TOKEN_ICONSIZE, width(), KGlobalSettings::generalFont().pointSize());
+		painter.drawRect(0, TOKEN_ICONSIZE, width(), TDEGlobalSettings::generalFont().pointSize());
 
 		painter.setPen(TQt::white);
-		painter.setFont(TQFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::DemiBold));
+		painter.setFont(TQFont(TDEGlobalSettings::generalFont().family(), TDEGlobalSettings::generalFont().pointSize(), TQFont::DemiBold));
 		painter.drawText(1, height()-1, (m_player ? m_player->name() : TQString()));
 
 		b_recreate = false;