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

7 files changed, 49 insertions, 49 deletions

diff --git a/kdict/actions.cpp b/kdict/actions.cpp
index 1c9c757c..5acf3c3c 100644
--- a/kdict/actions.cpp
+++ b/kdict/actions.cpp
@@ -26,7 +26,7 @@
 
 DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name,
                                   bool editable, bool autoSized )
-  : KAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(KGlobalSettings::completionMode())
+  : KAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(TDEGlobalSettings::completionMode())
 {
 }
 
@@ -160,7 +160,7 @@ void DictComboAction::setList(TQStringList items)
 }
 
 
-KGlobalSettings::Completion DictComboAction::completionMode()
+TDEGlobalSettings::Completion DictComboAction::completionMode()
 {
   if (m_combo)
     return m_combo->completionMode();
@@ -169,7 +169,7 @@ KGlobalSettings::Completion DictComboAction::completionMode()
  }
 
 
-void DictComboAction::setCompletionMode(KGlobalSettings::Completion mode)
+void DictComboAction::setCompletionMode(TDEGlobalSettings::Completion mode)
 {
   if (m_combo)
     m_combo->setCompletionMode(mode);
diff --git a/kdict/actions.h b/kdict/actions.h
index a1b26474..bf7553d2 100644
--- a/kdict/actions.h
+++ b/kdict/actions.h
@@ -53,8 +53,8 @@ class DictComboAction : public KAction
     void clear();
     void setList(TQStringList items);
 
-    KGlobalSettings::Completion completionMode();
-    void setCompletionMode(KGlobalSettings::Completion mode);
+    TDEGlobalSettings::Completion completionMode();
+    void setCompletionMode(TDEGlobalSettings::Completion mode);
 
   signals:
     void activated(int);
@@ -67,7 +67,7 @@ class DictComboAction : public KAction
   private:
     TQGuardedPtr<KComboBox> m_combo;
     bool m_editable, m_autoSized;
-    KGlobalSettings::Completion m_compMode;
+    TDEGlobalSettings::Completion m_compMode;
 };
 
 
diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp
index 054bf953..51f02faf 100644
--- a/kdict/applet/kdictapplet.cpp
+++ b/kdict/applet/kdictapplet.cpp
@@ -76,7 +76,7 @@ extern "C"
 {
   KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
   {
-    KGlobal::locale()->insertCatalogue("kdictapplet");
+    TDEGlobal::locale()->insertCatalogue("kdictapplet");
     return new DictApplet(configFile, KPanelApplet::Stretch, 0, parent, "kdictapplet");
   }
 }
@@ -99,7 +99,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
 
   iconLabel = new TQLabel(baseWidget);
   iconLabel->setBackgroundOrigin(AncestorOrigin);
-  TQPixmap pm = KGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, KIcon::SizeSmall, KIcon::DefaultState, 0L, true);
+  TQPixmap pm = TDEGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, KIcon::SizeSmall, KIcon::DefaultState, 0L, true);
   iconLabel->setPixmap(pm);
   baseLay->addWidget(iconLabel,1,0);
   iconLabel->setAlignment(TQt::AlignCenter | TQt::AlignVCenter);
@@ -162,10 +162,10 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
   connect(externalCombo, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(startQuery(const TQString&)));
   externalCombo->setFixedSize(160, externalCombo->sizeHint().height());
   
-  connect(internalCombo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
-          this, TQT_SLOT(updateCompletionMode(KGlobalSettings::Completion)));
-  connect(externalCombo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
-          this, TQT_SLOT(updateCompletionMode(KGlobalSettings::Completion)));
+  connect(internalCombo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+          this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion)));
+  connect(externalCombo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+          this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion)));
 
   // restore history and completion list
   KConfig *c = config();
@@ -174,9 +174,9 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
   TQStringList list = c->readListEntry("Completion list");
   completionObject->setItems(list);
   int mode = c->readNumEntry("Completion mode", 
-                             KGlobalSettings::completionMode());
-  internalCombo->setCompletionMode((KGlobalSettings::Completion)mode);  
-  externalCombo->setCompletionMode((KGlobalSettings::Completion)mode);  
+                             TDEGlobalSettings::completionMode());
+  internalCombo->setCompletionMode((TDEGlobalSettings::Completion)mode);  
+  externalCombo->setCompletionMode((TDEGlobalSettings::Completion)mode);  
 
   list = c->readListEntry("History list");
   internalCombo->setHistoryItems(list);  
@@ -252,7 +252,7 @@ void DictApplet::resizeEvent(TQResizeEvent*)
     verticalBtn->setFixedSize(width(),width());
 
     KIcon::StdSizes sz = 	width() < 32 ?	KIcon::SizeSmall : (width() < 48 ? KIcon::SizeMedium : KIcon::SizeLarge);
-    TQPixmap pm = KGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, sz, KIcon::DefaultState, 0L, true);
+    TQPixmap pm = TDEGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, sz, KIcon::DefaultState, 0L, true);
     verticalBtn->setPixmap(pm);
 	}
 }
@@ -394,7 +394,7 @@ void DictApplet::externalComboHidden()
   verticalBtn->setDown(false);
 }
 
-void DictApplet::updateCompletionMode(KGlobalSettings::Completion mode)
+void DictApplet::updateCompletionMode(TDEGlobalSettings::Completion mode)
 {
   internalCombo->setCompletionMode(mode);
   externalCombo->setCompletionMode(mode);
diff --git a/kdict/applet/kdictapplet.h b/kdict/applet/kdictapplet.h
index b7b94286..d1127e15 100644
--- a/kdict/applet/kdictapplet.h
+++ b/kdict/applet/kdictapplet.h
@@ -84,7 +84,7 @@ protected slots:
   void startMatch();
   void showExternalCombo();
   void externalComboHidden();
-  void updateCompletionMode(KGlobalSettings::Completion mode);
+  void updateCompletionMode(TDEGlobalSettings::Completion mode);
 
 private:
   KHistoryCombo  *internalCombo, *externalCombo;
diff --git a/kdict/options.cpp b/kdict/options.cpp
index efb5f962..e7ff3339 100644
--- a/kdict/options.cpp
+++ b/kdict/options.cpp
@@ -44,7 +44,7 @@
 
 void GlobalData::read()
 {
-  KConfig *config=KGlobal::config();
+  KConfig *config=TDEGlobal::config();
 
   // general...
   config->setGroup("General");
@@ -67,27 +67,27 @@ void GlobalData::read()
   config->setGroup("Colors");
   useCustomColors=config->readBoolEntry("customColors", false);
 
-  TQColor defCol=KGlobalSettings::textColor();
+  TQColor defCol=TDEGlobalSettings::textColor();
   c_olors[Ctext]=config->readColorEntry("textColor",&defCol);
   c_olorNames[Ctext]=i18n("Text");
 
-  defCol=KGlobalSettings::baseColor();
+  defCol=TDEGlobalSettings::baseColor();
   c_olors[Cbackground]=config->readColorEntry("backgroundColor",&defCol);
   c_olorNames[Cbackground]=i18n("Background");
 
-  defCol=KGlobalSettings::highlightedTextColor();
+  defCol=TDEGlobalSettings::highlightedTextColor();
   c_olors[CheadingsText]=config->readColorEntry("headingsTextColor",&defCol);
   c_olorNames[CheadingsText]=i18n("Heading Text");
 
-  defCol=KGlobalSettings::highlightColor();
+  defCol=TDEGlobalSettings::highlightColor();
   c_olors[CheadingsBackground]=config->readColorEntry("headingsBackgroundColor",&defCol);
   c_olorNames[CheadingsBackground]=i18n("Heading Background");
 
-  defCol=KGlobalSettings::linkColor();
+  defCol=TDEGlobalSettings::linkColor();
   c_olors[Clinks]=config->readColorEntry("linksColor",&defCol);
   c_olorNames[Clinks]=i18n("Link");
 
-  defCol=KGlobalSettings::visitedLinkColor();
+  defCol=TDEGlobalSettings::visitedLinkColor();
   c_olors[CvisitedLinks]=config->readColorEntry("linksColor",&defCol);
   c_olorNames[CvisitedLinks]=i18n("Followed Link");
 
@@ -95,7 +95,7 @@ void GlobalData::read()
   config->setGroup("Fonts");
   useCustomFonts=config->readBoolEntry("customFonts", false);
 
-  TQFont defFont=KGlobalSettings::generalFont();
+  TQFont defFont=TDEGlobalSettings::generalFont();
   f_onts[Ftext]=config->readFontEntry("textFont",&defFont);
   f_ontNames[Ftext]=i18n("Text");
 
@@ -114,8 +114,8 @@ void GlobalData::read()
   splitterSizes = config->readIntListEntry("Splitter_Sizes");
 
   config->setGroup("Query Combo");
-  queryComboCompletionMode = (KGlobalSettings::Completion)config->readNumEntry("Completion_mode",
-                                                                               KGlobalSettings::completionMode());
+  queryComboCompletionMode = (TDEGlobalSettings::Completion)config->readNumEntry("Completion_mode",
+                                                                               TDEGlobalSettings::completionMode());
 
   config->setGroup("Query_History");
   queryHistory = config->readListEntry("History");
@@ -182,7 +182,7 @@ void GlobalData::read()
 
 void GlobalData::write()
 {
-  KConfig *config=KGlobal::config();
+  KConfig *config=TDEGlobal::config();
 
   config->setGroup("General");
   config->writeEntry("Lookup_Clipboard",defineClipboard);
@@ -249,32 +249,32 @@ TQColor GlobalData::defaultColor(int i)
 {
   switch(i) {
     case Ctext:
-      return KGlobalSettings::textColor();
+      return TDEGlobalSettings::textColor();
     break;
 
     case Cbackground:
-      return KGlobalSettings::baseColor();
+      return TDEGlobalSettings::baseColor();
     break;
 
     case CheadingsText:
-      return KGlobalSettings::highlightedTextColor();
+      return TDEGlobalSettings::highlightedTextColor();
     break;
 
     case CheadingsBackground:
-      return KGlobalSettings::highlightColor();
+      return TDEGlobalSettings::highlightColor();
     break;
 
     case Clinks:
-      return KGlobalSettings::linkColor();
+      return TDEGlobalSettings::linkColor();
     break;
 
     case CvisitedLinks:
-      return KGlobalSettings::visitedLinkColor();
+      return TDEGlobalSettings::visitedLinkColor();
     break;
 
   }
 
-  return KGlobalSettings::baseColor();
+  return TDEGlobalSettings::baseColor();
 }
 
 
@@ -334,7 +334,7 @@ TQColor GlobalData::visitedLinksColor()
 
 TQFont GlobalData::defaultFont(int i)
 {
-  TQFont font = KGlobalSettings::generalFont();
+  TQFont font = TDEGlobalSettings::generalFont();
 
   if (font.pointSize() < 5)
     font.setPointSize(12);
@@ -535,10 +535,10 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   grid->addWidget(w_pipesize,4,1);
   connect( w_pipesize, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) );
 
-  TQStringList encodingNames = KGlobal::charsets()->descriptiveEncodingNames();
+  TQStringList encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames();
   int i=0,x=0;
   for ( TQStringList::Iterator it = encodingNames.begin(); it != encodingNames.end(); ++it ) {
-    if (KGlobal::charsets()->encodingForName(*it)==global->encoding) {
+    if (TDEGlobal::charsets()->encodingForName(*it)==global->encoding) {
       x = i;
       break;
     }
@@ -743,7 +743,7 @@ void OptionsDialog::slotApply()
   global->timeout = w_timeout->value();
   global->idleHold = w_idleHold->value();
   global->pipeSize = w_pipesize->value();
-  global->encoding = KGlobal::charsets()->encodingForName(w_encoding->currentText());
+  global->encoding = TDEGlobal::charsets()->encodingForName(w_encoding->currentText());
   global->authEnabled = w_auth->isChecked();
   global->user = w_user->text();
   global->secret = w_secret->text();
@@ -792,9 +792,9 @@ void OptionsDialog::slotDefault()
     w_idleHold->setValue(30);
     w_timeout->setValue(60);
     w_pipesize->setValue(256);
-    encodingNames = KGlobal::charsets()->descriptiveEncodingNames();
+    encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames();
     for ( TQStringList::Iterator it = encodingNames.begin(); it != encodingNames.end(); ++it ) {
-      if (KGlobal::charsets()->encodingForName(*it)=="utf8")
+      if (TDEGlobal::charsets()->encodingForName(*it)=="utf8")
         x = i;
       i++;
     }
diff --git a/kdict/options.h b/kdict/options.h
index a04f9ac6..cea767c1 100644
--- a/kdict/options.h
+++ b/kdict/options.h
@@ -78,7 +78,7 @@ public:
   bool showMatchList;
   TQValueList<int> splitterSizes;
 
-  KGlobalSettings::Completion queryComboCompletionMode;
+  TDEGlobalSettings::Completion queryComboCompletionMode;
 
   TQStringList queryHistory;
   bool saveHistory;               // save query history to disk on exit?
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index 17374766..a1bacd2b 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -90,7 +90,7 @@ TopLevel::TopLevel(TQWidget* parent, const char* name)
   if (global->showMatchList)
   {    // show splitter, html view & match list
     splitter = new TQSplitter(Qt::Horizontal,this);
-    splitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+    splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
     queryView->reparent(splitter,0,queryView->pos(),true);
     matchView->reparent(splitter,0,matchView->pos(),true);
     setCentralWidget(splitter);
@@ -105,7 +105,7 @@ TopLevel::TopLevel(TQWidget* parent, const char* name)
 
   //apply settings
   resize(600,390);
-  applyMainWindowSettings(KGlobal::config(),"toplevel_options");
+  applyMainWindowSettings(TDEGlobal::config(),"toplevel_options");
   stratDbChanged();              // fill combos, build menus
 
   actQueryCombo->setFocus();        // place cursor in combobox
@@ -295,7 +295,7 @@ bool TopLevel::queryClose()
 {
   kdDebug(5004) << "TopLevel::queryClose()" << endl;
 
-  saveMainWindowSettings(KGlobal::config(),"toplevel_options");
+  saveMainWindowSettings(TDEGlobal::config(),"toplevel_options");
   saveMatchViewSize();
   global->queryComboCompletionMode = actQueryCombo->completionMode();
 
@@ -642,7 +642,7 @@ void TopLevel::toggleMatchListShow()
   {
     global->showMatchList = true;
     splitter = new TQSplitter(Qt::Horizontal,this);
-    splitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+    splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
     setCentralWidget(splitter);
     splitter->show();
     queryView->reparent(splitter,0,queryView->pos(),true);
@@ -675,7 +675,7 @@ void TopLevel::adjustMatchViewSize()
 
 void TopLevel::slotConfToolbar()
 {
-  saveMainWindowSettings(KGlobal::config(),"toplevel_options");
+  saveMainWindowSettings(TDEGlobal::config(),"toplevel_options");
   KEditToolbar dlg(actionCollection(), "kdictui.rc");
   connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
   dlg.exec();
@@ -685,7 +685,7 @@ void TopLevel::slotConfToolbar()
 void TopLevel::slotNewToolbarConfig()
 {
   recreateGUI();
-  applyMainWindowSettings(KGlobal::config(),"toplevel_options");
+  applyMainWindowSettings(TDEGlobal::config(),"toplevel_options");
   buildHistMenu();   // actionlists must be inserted
   stratDbChanged();
 }