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

6 files changed, 16 insertions, 16 deletions

diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp
index 843403f9..4db64d0b 100644
--- a/kviewshell/documentWidget.cpp
+++ b/kviewshell/documentWidget.cpp
@@ -90,7 +90,7 @@ DocumentWidget::DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache
 
   if (!busyIcon)
   {
-    busyIcon = new TQPixmap(KGlobal::iconLoader()->loadIcon("gear", KIcon::NoGroup, KIcon::SizeMedium));
+    busyIcon = new TQPixmap(TDEGlobal::iconLoader()->loadIcon("gear", KIcon::NoGroup, KIcon::SizeMedium));
 
     URShadow = new TQPixmap();
     BRShadow = new TQPixmap();
@@ -316,7 +316,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e)
 #ifdef DEBUG_DOCUMENTWIDGET
         kdDebug(1223) << "Underline hyperlink \"" << pageData->hyperLinkList[i].linkText << "\"" << endl;
 #endif
-        p.fillRect(x, y, w, h, KGlobalSettings::linkColor());
+        p.fillRect(x, y, w, h, TDEGlobalSettings::linkColor());
       }
     }
   }
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index e4dbf633..c09ebeb8 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -61,7 +61,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   : KViewPart_Iface(parent, name), showSidebar(0), saveAction(0), partManager(0),
     multiPageLibrary(TQString()), aboutDialog(0)
 {
-  KGlobal::locale()->insertCatalogue("kviewshell");
+  TDEGlobal::locale()->insertCatalogue("kviewshell");
 
   tmpUnzipped = 0L;
   pageChangeIsConnected = false;
@@ -419,7 +419,7 @@ TQString KViewPart::pageSizeDescription()
 
   TQString size = " ";
   if (s.formatNumber() == -1) {
-    if (KGlobal::locale()-> measureSystem() == KLocale::Metric)
+    if (TDEGlobal::locale()-> measureSystem() == KLocale::Metric)
       size += TQString("%1x%2 mm").arg(s.width().getLength_in_mm(), 0, 'f', 0).arg(s.height().getLength_in_mm(), 0, 'f', 0);
     else
       size += TQString("%1x%2 in").arg(s.width().getLength_in_inch(), 0, 'g', 2).arg(s.height().getLength_in_inch(), 0, 'g', 2);
diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp
index e3bde285..e9ffba38 100644
--- a/kviewshell/kviewshell.cpp
+++ b/kviewshell/kviewshell.cpp
@@ -288,7 +288,7 @@ void KViewShell::slotConfigureKeys()
 
 void KViewShell::slotEditToolbar()
 {
-  saveMainWindowSettings( KGlobal::config(), autoSaveGroup() );
+  saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
   KEditToolbar dlg(factory());
   connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_SLOT( slotNewToolbarConfig() ) );
   dlg.exec();
@@ -297,7 +297,7 @@ void KViewShell::slotEditToolbar()
 
 void KViewShell::slotNewToolbarConfig()
 {
-  applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
+  applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
 }
 
 void KViewShell::dragEnterEvent(TQDragEnterEvent *event)
diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp
index 65c671a1..31b257f2 100644
--- a/kviewshell/marklist.cpp
+++ b/kviewshell/marklist.cpp
@@ -63,7 +63,7 @@ ThumbnailWidget::ThumbnailWidget(MarkListWidget* _parent, const PageNumber& _pag
 
   if (!waitIcon)
   {
-    waitIcon = new TQPixmap(KGlobal::iconLoader()->loadIcon("gear", KIcon::NoGroup, KIcon::SizeMedium));
+    waitIcon = new TQPixmap(TDEGlobal::iconLoader()->loadIcon("gear", KIcon::NoGroup, KIcon::SizeMedium));
   }
 }
 
@@ -188,11 +188,11 @@ MarkListWidget::MarkListWidget(TQWidget* _parent, MarkList* _markList, const Pag
   pageLabel = new TQLabel(TQString("%1").arg(pageNumber), this);
   bottomLayout->addWidget(pageLabel, 1);
 
-  _backgroundColor = KGlobalSettings::baseColor();
+  _backgroundColor = TDEGlobalSettings::baseColor();
 
   // Alternate between colors.
-  if ((pageNumber % 2 == 0) && KGlobalSettings::alternateBackgroundColor().isValid())
-    _backgroundColor = KGlobalSettings::alternateBackgroundColor();
+  if ((pageNumber % 2 == 0) && TDEGlobalSettings::alternateBackgroundColor().isValid())
+    _backgroundColor = TDEGlobalSettings::alternateBackgroundColor();
 
   setPaletteBackgroundColor( _backgroundColor );
 
diff --git a/kviewshell/pageSize.cpp b/kviewshell/pageSize.cpp
index d9182d6b..c1a99744 100644
--- a/kviewshell/pageSize.cpp
+++ b/kviewshell/pageSize.cpp
@@ -210,7 +210,7 @@ TQString pageSize::preferredUnit() const
     return staticList[currentSize].preferredUnit;
 
   // User-defined size. Give a preferred unit depening on the locale.
-  if (KGlobal::locale()-> measureSystem() == KLocale::Metric)
+  if (TDEGlobal::locale()-> measureSystem() == KLocale::Metric)
     return "mm";
   else
     return "in";
@@ -330,10 +330,10 @@ void pageSize::reconstructCurrentSize()
 
 int pageSize::defaultPageSize()
 {
-  // FIXME: static_cast<TQPrinter::PageSize>(KGlobal::locale()->pageSize())
+  // FIXME: static_cast<TQPrinter::PageSize>(TDEGlobal::locale()->pageSize())
   //        is the proper solution here.  Then you can determine the values
   //        without using your hardcoded table too!
-  if (KGlobal::locale()-> measureSystem() == KLocale::Metric)
+  if (TDEGlobal::locale()-> measureSystem() == KLocale::Metric)
     return defaultMetricPaperSize;
   else
     return defaultImperialPaperSize;
diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp
index 38c0644c..3f4e64f5 100644
--- a/kviewshell/searchWidget.cpp
+++ b/kviewshell/searchWidget.cpp
@@ -46,7 +46,7 @@ SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl)
   layout = new TQHBoxLayout(this, 4, 6, "SearchWidgetLayout");
 
   stopButton = new TQPushButton(this, "stopButton");
-  stopButton->setPixmap(KGlobal::iconLoader()->loadIcon("stop", KIcon::Small, KIcon::SizeSmall));
+  stopButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("stop", KIcon::Small, KIcon::SizeSmall));
   layout->addWidget(stopButton);
 
   searchLabel = new TQLabel(this, "searchLabel");
@@ -59,12 +59,12 @@ SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl)
   searchLabel->setBuddy(searchText);
 
   findPrevButton = new TQPushButton(this, "findPrevButton");
-  findPrevButton->setPixmap(KGlobal::iconLoader()->loadIcon("back", KIcon::NoGroup, KIcon::SizeSmall));
+  findPrevButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("back", KIcon::NoGroup, KIcon::SizeSmall));
   TQToolTip::add(findPrevButton, i18n("Find previous"));
   layout->addWidget(findPrevButton);
 
   findNextButton = new TQPushButton(this, "findNextButton");
-  findNextButton->setPixmap(KGlobal::iconLoader()->loadIcon("forward", KIcon::NoGroup, KIcon::SizeSmall));
+  findNextButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("forward", KIcon::NoGroup, KIcon::SizeSmall));
   TQToolTip::add(findNextButton, i18n("Find next"));
   layout->addWidget(findNextButton);