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

11 files changed, 21 insertions, 21 deletions

diff --git a/kivio/kiviopart/config/kivio.kcfg b/kivio/kiviopart/config/kivio.kcfg
index 8eea04b3..ac23c8e3 100644
--- a/kivio/kiviopart/config/kivio.kcfg
+++ b/kivio/kiviopart/config/kivio.kcfg
@@ -14,7 +14,7 @@
   <group name="DefaultPageLayout">
     <entry name="Format" type="String">
       <label>The default page layout.</label>
-      <default code="true">Kivio::pageSizeString(KGlobal::locale()->pageSize())</default>
+      <default code="true">Kivio::pageSizeString(TDEGlobal::locale()->pageSize())</default>
     </entry>
     <entry name="Orientation" type="String">
       <label>The orientation of the page.</label>
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index 5a9d0a77..a731869f 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -552,7 +552,7 @@ bool KivioDoc::loadXML( TQIODevice *, const TQDomDocument& doc )
 
 bool KivioDoc::loadStencilSpawnerSet(const TQString &id, bool hidden)
 {
-  KStandardDirs *dirs = KGlobal::dirs();
+  KStandardDirs *dirs = TDEGlobal::dirs();
   TQStringList dirList = dirs->findDirs("data", "kivio/stencils");
   TQString rootDir;
 
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 3c45c639..35b32e56 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -163,8 +163,8 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
     TQString unit = KoUnit::unitName(m_pDoc->unit());
     KoPoint xy(0, 0);
     TQString text = i18n("%1 x coord, %2 y coord, %3 and %4 the unit",
-                        "X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
-                        .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
+                        "X: %1 %3 Y: %2 %4").arg(TDEGlobal::_locale->formatNumber(xy.x(), 2))
+                        .arg(TDEGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
     m_coordSLbl = new KStatusBarLabel(text, MOUSEPOS_TEXT, sb);
     addStatusBarItem(m_coordSLbl, 0, true);
   }
@@ -1842,8 +1842,8 @@ void KivioView::setMousePos( int mx, int my )
     KoPoint xy = m_pCanvas->mapFromScreen(TQPoint(mx, my));
     xy.setX(KoUnit::toUserValue(xy.x(), m_pDoc->unit()));
     xy.setY(KoUnit::toUserValue(xy.y(), m_pDoc->unit()));
-    TQString text = i18n("X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2))
-      .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
+    TQString text = i18n("X: %1 %3 Y: %2 %4").arg(TDEGlobal::_locale->formatNumber(xy.x(), 2))
+      .arg(TDEGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit);
     m_coordSLbl->setText(text);
   }
 }
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index fe301ba3..f4e1e217 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -121,7 +121,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
       if ( m_parentCollection )
         instance = m_parentCollection->instance();
       else
-        instance = KGlobal::instance();
+        instance = TDEGlobal::instance();
 
       bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
                           TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
diff --git a/kivio/kiviopart/kivioglobal.cpp b/kivio/kiviopart/kivioglobal.cpp
index 201eea08..c794afea 100644
--- a/kivio/kiviopart/kivioglobal.cpp
+++ b/kivio/kiviopart/kivioglobal.cpp
@@ -85,7 +85,7 @@ KoPageLayout Kivio::loadPageLayout(const TQDomElement& e)
     layout.ptRight = XmlReadFloat(e, "marginRight", 0.0);
     layout.ptTop = XmlReadFloat(e, "marginTop", 0.0);
     layout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0);
-    layout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize())));
+    layout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(TDEGlobal::locale()->pageSize())));
     layout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait"));
   }
 
@@ -1285,7 +1285,7 @@ TQString Kivio::systemDefaultUnit()
 {
   TQString defMS = "cm";
 
-  if(KGlobal::locale()->measureSystem() == KLocale::Imperial) {
+  if(TDEGlobal::locale()->measureSystem() == KLocale::Imperial) {
     defMS = "in";
   }
 
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil.h b/kivio/kiviopart/kiviosdk/kivio_stencil.h
index ef056c3d..9fcfc81b 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil.h
@@ -197,7 +197,7 @@ class KIVIO_EXPORT KivioStencil
     virtual TQColor textColor() { return TQColor(0,0,0); }
     virtual void setTextColor( TQColor ) {;}
 
-    virtual TQFont textFont() { return KGlobalSettings::generalFont(); }
+    virtual TQFont textFont() { return TDEGlobalSettings::generalFont(); }
     virtual void setTextFont( const TQFont & ) {;}
 
     virtual int hTextAlign() { return -1; }
@@ -272,7 +272,7 @@ class KIVIO_EXPORT KivioStencil
     virtual TQColor textColor(const TQString& /*textBoxName*/) { return TQColor(); }
     virtual void setTextColor(const TQString& /*textBoxName*/, const TQColor& /*color*/) {}
 
-    virtual TQFont textFont(const TQString& /*textBoxName*/) { return KGlobalSettings::generalFont(); }
+    virtual TQFont textFont(const TQString& /*textBoxName*/) { return TDEGlobalSettings::generalFont(); }
     virtual void setTextFont(const TQString& /*textBoxName*/, const TQFont& /*font*/) {}
 
     virtual int hTextAlign(const TQString& /*textBoxName*/) { return -1; }
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp
index 730e07ca..1c25f22f 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp
@@ -72,7 +72,7 @@ bool KivioStencilSpawnerInfo::loadXML( const TQDomElement &e )
     }
     else if((nodeName.compare("Title")==0) && nodeElement.hasAttribute("lang"))
     {
-      if(nodeElement.attribute("lang") == KGlobal::locale()->language()) {
+      if(nodeElement.attribute("lang") == TDEGlobal::locale()->language()) {
         m_title = nodeElement.attribute("data");
       }
     }
@@ -86,7 +86,7 @@ bool KivioStencilSpawnerInfo::loadXML( const TQDomElement &e )
     }
     else if((nodeName.compare("Description")==0) && nodeElement.hasAttribute("lang"))
     {
-      if(nodeElement.attribute("lang") == KGlobal::locale()->language()) {
+      if(nodeElement.attribute("lang") == TDEGlobal::locale()->language()) {
         m_desc = nodeElement.attribute("data");
       }
     }
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
index 0fdd2ac1..e71b4cb1 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
@@ -182,7 +182,7 @@ TQString KivioStencilSpawnerSet::readTitle( const TQString &dir )
 
     if( nodeName.compare("Title")==0 && nodeElement.hasAttribute("lang"))
     {
-      if(nodeElement.attribute("lang") == KGlobal::locale()->language()) {
+      if(nodeElement.attribute("lang") == TDEGlobal::locale()->language()) {
         title = XmlReadString( nodeElement, "data", dir );
       }
     }
@@ -269,7 +269,7 @@ TQString KivioStencilSpawnerSet::readDescription(const TQString& dir)
 
     if( nodeName.compare("Description")==0 && nodeElement.hasAttribute("lang"))
     {
-      if(nodeElement.attribute("lang") == KGlobal::locale()->language()) {
+      if(nodeElement.attribute("lang") == TDEGlobal::locale()->language()) {
         description = nodeElement.text();
       }
     }
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index 3c798b37..79342465 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -134,7 +134,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
       if ( m_parentCollection )
         instance = m_parentCollection->instance();
       else
-        instance = KGlobal::instance();
+        instance = TDEGlobal::instance();
 
       bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
                           TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
@@ -184,7 +184,7 @@ void KivioStencilSetAction::updateMenu()
   m_collectionIdList.clear();
   clearCollectionMenuList();
 
-  KStandardDirs *dirs = KGlobal::dirs();
+  KStandardDirs *dirs = TDEGlobal::dirs();
   TQStringList dirList = dirs->findDirs("data", "kivio/stencils");
   dirList.sort();
 
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
index 11c2cc28..9cbe4385 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
@@ -72,7 +72,7 @@ namespace Kivio {
   
   void AddStencilSetPanel::updateList()
   {
-    KStandardDirs *dirs = KGlobal::dirs();
+    KStandardDirs *dirs = TDEGlobal::dirs();
     TQStringList dirList = dirs->findDirs("data", "kivio/stencils");
     dirList.sort();
     m_stencilSetLView->clear();
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index 5621074d..613f0fd4 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -53,7 +53,7 @@
 // {
 //   setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ?
 //     "guides_vertical":"guides_horizontal"));
-//   TQString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2);
+//   TQString s = TDEGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2);
 //   s += " " + KoUnit::unitName(u);
 //   setText(1, s);
 // }
@@ -65,7 +65,7 @@
 // 
 // void GuidesListViewItem::setUnit(KoUnit::Unit u)
 // {
-//   TQString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2);
+//   TQString s = TDEGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2);
 //   s += " " + KoUnit::unitName(u);
 //   setText(1, s);
 // }
@@ -73,7 +73,7 @@
 // void GuidesListViewItem::setPosition(double p, KoUnit::Unit u)
 // {
 //   m_data->setPosition(KoUnit::fromUserValue(p, u));
-//   TQString s = KGlobal::_locale->formatNumber(p, 2);
+//   TQString s = TDEGlobal::_locale->formatNumber(p, 2);
 //   s += " " + KoUnit::unitName(u);
 //   setText(1, s);
 // }