From f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:45:16 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 konquest/Konquest.cc    | 2 +-
 konquest/fleetdlg.cc    | 2 +-
 konquest/gameboard.cc   | 4 ++--
 konquest/map_widget.cc  | 2 +-
 konquest/planet_info.cc | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'konquest')

diff --git a/konquest/Konquest.cc b/konquest/Konquest.cc
index e06125d1..25a08857 100644
--- a/konquest/Konquest.cc
+++ b/konquest/Konquest.cc
@@ -20,7 +20,7 @@ main(int argc, char **argv)
 
     TDEApplication a;
     TQApplication::setGlobalMouseTracking( true );
-    KGlobal::locale()->insertCatalogue("libtdegames");
+    TDEGlobal::locale()->insertCatalogue("libtdegames");
 
     if (a.isRestored())
         RESTORE(MainWindow)
diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc
index e933e895..d45cb88e 100644
--- a/konquest/fleetdlg.cc
+++ b/konquest/fleetdlg.cc
@@ -82,7 +82,7 @@ FleetDlg::init()
                                  TQString("%1").arg(fleetNumber),
                                  curFleet->destination->getName(),
                                  TQString("%1").arg(curFleet->getShipCount()),
-                                 TQString("%1").arg(KGlobal::locale()->formatNumber(curFleet->killPercentage, 3)),
+                                 TQString("%1").arg(TDEGlobal::locale()->formatNumber(curFleet->killPercentage, 3)),
                                  TQString("%1").arg((int)ceil(curFleet->arrivalTurn)));
     }
 }
diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc
index 455ea03c..ce8ae2e0 100644
--- a/konquest/gameboard.cc
+++ b/konquest/gameboard.cc
@@ -317,8 +317,8 @@ GameBoard::turn()
                        "A ship leaving this turn will arrive on turn %4")
                   .arg(sourcePlanet->getName())
 		  .arg(destPlanet->getName())
-                  .arg(KGlobal::locale()->formatNumber( dist, 2 ))
-		  .arg(KGlobal::locale()->formatNumber( turnNumber + (int)dist, 0 ));
+                  .arg(TDEGlobal::locale()->formatNumber( dist, 2 ))
+		  .arg(TDEGlobal::locale()->formatNumber( turnNumber + (int)dist, 0 ));
 	    KMessageBox::information( this, msg, i18n("Distance"));
 
             gameState = NONE;
diff --git a/konquest/map_widget.cc b/konquest/map_widget.cc
index a8aa33de..ed3770b0 100644
--- a/konquest/map_widget.cc
+++ b/konquest/map_widget.cc
@@ -17,7 +17,7 @@ ConquestMap::ConquestMap(  Map *newMap, TQWidget *parent )
     map( newMap ), gridColor( 50, 80, 50 ),
     hiLiteRow( -1 ), hiLiteCol( -1 )
 {
-    labelFont = KGlobalSettings::generalFont();
+    labelFont = TDEGlobalSettings::generalFont();
     labelFont.setPointSize( 8 );
 
     setFrameStyle( NoFrame );
diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc
index 1d178493..29e2436e 100644
--- a/konquest/planet_info.cc
+++ b/konquest/planet_info.cc
@@ -147,13 +147,13 @@ void PlanetInfo::showPlanet( Planet *planet )
             temp = "<qt>" + i18n("Owner: %1").arg(p->planet->getPlayer()->getColoredName());
             owner->setText( temp );
 
-            temp = "<qt>" + i18n("Ships: %1").arg( KGlobal::locale()->formatNumber(p->ships, 0) );
+            temp = "<qt>" + i18n("Ships: %1").arg( TDEGlobal::locale()->formatNumber(p->ships, 0) );
             ships->setText( temp );
 
-            temp = "<qt>" + i18n("Production: %1").arg( KGlobal::locale()->formatNumber(p->production, 0) );
+            temp = "<qt>" + i18n("Production: %1").arg( TDEGlobal::locale()->formatNumber(p->production, 0) );
             production->setText( temp );
 
-            temp = "<qt>" + i18n("Kill percent: %1").arg( KGlobal::locale()->formatNumber(p->killRate, 3) );
+            temp = "<qt>" + i18n("Kill percent: %1").arg( TDEGlobal::locale()->formatNumber(p->killRate, 3) );
             kill_percent->setText( temp );
         }
     }
-- 
cgit v1.2.1