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

5 files changed, 7 insertions, 7 deletions

diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index b8b7d40f8..9e92fb47e 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -94,7 +94,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     connect( cbListView, TQT_SIGNAL( toggled( bool ) ),
 	     this, TQT_SLOT( slotToggleSingleColumn( bool ) ) );
 
-    KGlobal::config()->reparseConfiguration();
+    TDEGlobal::config()->reparseConfiguration();
 
     //Create IconView
     TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "KIconView", this);
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 234f62543..94314ffbc 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -52,7 +52,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
 
   m_ro = new KComboBox(hbox, "ReadOnlyCombo" );
   lbl->setBuddy (m_ro);
-  m_ro->setCompletionMode( KGlobalSettings::CompletionAuto );
+  m_ro->setCompletionMode( TDEGlobalSettings::CompletionAuto );
   TQObject::connect (m_ro, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
   TQObject::connect (m_ro, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&)));
   vbox->addWidget (hbox);
@@ -142,7 +142,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   KCompletion * s_pCompletion = new KCompletion;
   s_pCompletion->setOrder( KCompletion::Weighted );
   s_pCompletion->setItems( historyConfig.readListEntry( "ComboContents" ) );
-  s_pCompletion->setCompletionMode( KGlobalSettings::completionMode() );
+  s_pCompletion->setCompletionMode( TDEGlobalSettings::completionMode() );
   m_konqc->setCompletionObject( s_pCompletion );
 
   TQPixmap pix = SmallIcon("www");
diff --git a/tdeui/tests/klistviewtest.cpp b/tdeui/tests/klistviewtest.cpp
index 582ae19e9..9fc108e52 100644
--- a/tdeui/tests/klistviewtest.cpp
+++ b/tdeui/tests/klistviewtest.cpp
@@ -28,12 +28,12 @@ int main( int argc, char **argv )
 	new KListViewItem( view, "Item 1");
 	new KListViewItem( view, "Item 2", "Some more", "Hi Mom :)" );
 
-	view->restoreLayout( KGlobal::config(), "ListView" );
+	view->restoreLayout( TDEGlobal::config(), "ListView" );
 
 	new KListViewItem( view, "Item 3" );
 
 	dialog.exec();
-	view->saveLayout( KGlobal::config(), "ListView" );
+	view->saveLayout( TDEGlobal::config(), "ListView" );
 
 	return 0;
 }
diff --git a/tdeui/tests/ktoolbarlabelactiontest.cpp b/tdeui/tests/ktoolbarlabelactiontest.cpp
index 5c1ffa757..617808f40 100644
--- a/tdeui/tests/ktoolbarlabelactiontest.cpp
+++ b/tdeui/tests/ktoolbarlabelactiontest.cpp
@@ -86,7 +86,7 @@ int main( int argc, char **argv )
 {
   TDEApplication app( argc, argv, "ktoolbarlabelactiontest" );
 
-  KGlobal::instance()->dirs()->addResourceDir("data", ".");
+  TDEGlobal::instance()->dirs()->addResourceDir("data", ".");
 
   MainWindow* mw = new MainWindow;
   app.setMainWidget(mw);
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index 9f764e774..4c9e83bc1 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -22,7 +22,7 @@ int main( int argc, char **argv )
 
     // KXMLGUIClient looks in the "data" resource for the .rc files
     // Let's add $PWD (ideally $srcdir instead...) to it
-    KGlobal::dirs()->addResourceDir( "data", TQDir::currentDirPath() );
+    TDEGlobal::dirs()->addResourceDir( "data", TQDir::currentDirPath() );
 
     KMainWindow *mainwindow = new KMainWindow;