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

6 files changed, 21 insertions, 21 deletions

diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp
index e994d8ed..2b0a8537 100644
--- a/kview/config/kviewconfmodules.cpp
+++ b/kview/config/kviewconfmodules.cpp
@@ -57,16 +57,16 @@ KViewGeneralConfig::~KViewGeneralConfig()
 
 void KViewGeneralConfig::save()
 {
-	KConfigGroup cfgGroup( KGlobal::config(), "KView General" );
+	KConfigGroup cfgGroup( TDEGlobal::config(), "KView General" );
 	m_savedPosition = m_pResizeGroup->id( m_pResizeGroup->selected() );
 	cfgGroup.writeEntry( "Resize Mode", m_savedPosition );
 	emit changed( false );
-	KGlobal::config()->sync();
+	TDEGlobal::config()->sync();
 }
 
 void KViewGeneralConfig::load()
 {
-	KConfigGroup cfgGroup( KGlobal::config(), "KView General" );
+	KConfigGroup cfgGroup( TDEGlobal::config(), "KView General" );
 	int m_savedPosition = cfgGroup.readNumEntry( "Resize Mode", 2 );
 	if( m_savedPosition < 0 || m_savedPosition > 3 )
 		m_savedPosition = 2;
diff --git a/kview/kview.cpp b/kview/kview.cpp
index 03951c4a..e48885ac 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -105,7 +105,7 @@ KView::KView()
 
 		connect( m_pCanvas->widget(), TQT_SIGNAL( cursorPos( const TQPoint & ) ), TQT_SLOT( cursorPos( const TQPoint & ) ) );
 
-		m_paRecent->loadEntries( KGlobal::config() );
+		m_paRecent->loadEntries( TDEGlobal::config() );
 		if (!initialGeometrySet())
 			resize(500, 350);
 		readSettings();
@@ -151,8 +151,8 @@ KView::KView()
 
 KView::~KView()
 {
-	saveSettings( KGlobal::config() );
-	KGlobal::config()->sync();
+	saveSettings( TDEGlobal::config() );
+	TDEGlobal::config()->sync();
 }
 
 void KView::load( const KURL & url )
@@ -167,7 +167,7 @@ void KView::load( const KURL & url )
 			// would do:
 			TQString directory = url.directory();
 			TQString key = TQString::fromLatin1( "load_image" );
-			KConfig * config = KGlobal::config();
+			KConfig * config = TDEGlobal::config();
 
 			config->setGroup( TQString::fromLatin1( "Recent Dirs" ) );
 			TQStringList result = config->readPathListEntry( key );
@@ -243,7 +243,7 @@ void KView::readSettings() // KConfig * config )
 {
 	// read settings from config/kviewrc
 	kdDebug( 4600 ) << k_funcinfo << endl;
-	KConfigGroup cfgGroup( KGlobal::config(), "KView General" );
+	KConfigGroup cfgGroup( TDEGlobal::config(), "KView General" );
 	m_nResizeMode = cfgGroup.readNumEntry( "Resize Mode", 2 );
 	kdDebug( 4600 ) << "m_nResizeMode = " << m_nResizeMode << endl;
 	loadPlugins();
@@ -346,16 +346,16 @@ void KView::slotUpdateFullScreen( bool set )
 	m_bFullscreen = set;
 	if( set )
 	{ // switch to FullScreen mode
-		saveMainWindowSettings( KGlobal::config(), "nonFullScreen MainWindow" );
+		saveMainWindowSettings( TDEGlobal::config(), "nonFullScreen MainWindow" );
 		showFullScreen();
-		applyMainWindowSettings( KGlobal::config(), "FullScreen MainWindow" );
+		applyMainWindowSettings( TDEGlobal::config(), "FullScreen MainWindow" );
 		m_paShowMenubar->setChecked( ! menuBar()->isHidden() );
 	}
 	else
 	{ // leave FullScreen mode
-		saveMainWindowSettings( KGlobal::config(), "FullScreen MainWindow" );
+		saveMainWindowSettings( TDEGlobal::config(), "FullScreen MainWindow" );
 		showNormal();
-		applyMainWindowSettings( KGlobal::config(), "nonFullScreen MainWindow" );
+		applyMainWindowSettings( TDEGlobal::config(), "nonFullScreen MainWindow" );
 		m_paShowMenubar->setChecked( ! menuBar()->isHidden() );
 		handleResize();
 	}
@@ -378,14 +378,14 @@ void KView::slotPreferences()
 	{
 		dlg = new KSettings::Dialog( this );
 		//dlg = new KConfigureDialog( KConfigureDialog::Configurable, this );
-		//dlg->addPluginInfos( KPluginInfo::fromKPartsInstanceName( instance()->instanceName(), KGlobal::config(), "KParts Plugins" ) );
+		//dlg->addPluginInfos( KPluginInfo::fromKPartsInstanceName( instance()->instanceName(), TDEGlobal::config(), "KParts Plugins" ) );
 	}
 	dlg->show();
 }
 
 void KView::slotConfigureToolbars()
 {
-	saveMainWindowSettings( KGlobal::config(), "MainWindow" );
+	saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
 	KEditToolbar dlg( factory() );
 	connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_SLOT( slotNewToolbarConfig() ) );
 	dlg.exec();
@@ -393,12 +393,12 @@ void KView::slotConfigureToolbars()
 
 void KView::slotNewToolbarConfig()
 {
-	applyMainWindowSettings( KGlobal::config(), "MainWindow" );
+	applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
 }
 
 void KView::reloadConfig()
 {
-	readSettings(); //KGlobal::config() );
+	readSettings(); //TDEGlobal::config() );
 }
 
 void KView::enableAction( const char * name, bool b )
diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp
index 2d4f8bb9..0fba3ab0 100644
--- a/kview/kviewviewer/kviewkonqextension.cpp
+++ b/kview/kviewviewer/kviewkonqextension.cpp
@@ -38,7 +38,7 @@ KViewKonqExtension::KViewKonqExtension( KImageViewer::Canvas * canvas,
 	m_pViewer( parent ),
 	m_pCanvas( canvas )
 {
-    KGlobal::locale()->insertCatalogue("kview");
+    TDEGlobal::locale()->insertCatalogue("kview");
 }
 
 void KViewKonqExtension::setXYOffset( int x, int y )
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index dbfa1c92..521e5d8c 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -649,7 +649,7 @@ void KViewViewer::setZoom( const TQString & newZoom )
 	if( newZoom == "33%" )
 		zoom = 1.0 / 3.0;
 	else
-		zoom = KGlobal::locale()->readNumber( z ) / 100;
+		zoom = TDEGlobal::locale()->readNumber( z ) / 100;
 
 	m_pCanvas->setZoom( zoom );
 }
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index 0fc6bfe2..7335f1af 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -353,7 +353,7 @@ void KViewPresenter::makeCurrent( TQListViewItem * item )
 	else
 	{
 		m_pCurrentItem = static_cast<ImageListItem*>( item );
-		m_pCurrentItem->setPixmap( 0, KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small ) );
+		m_pCurrentItem->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small ) );
 		m_pImageList->m_pListView->ensureItemVisible( m_pCurrentItem );
 	}
 }
diff --git a/kview/modules/scale/kfloatspinbox.cpp b/kview/modules/scale/kfloatspinbox.cpp
index 6870a20b..c260119e 100644
--- a/kview/modules/scale/kfloatspinbox.cpp
+++ b/kview/modules/scale/kfloatspinbox.cpp
@@ -86,12 +86,12 @@ void KFloatSpinBox::setValueBlocking( float value )
 
 TQString KFloatSpinBox::mapValueToText( int value )
 {
-	return KGlobal::locale()->formatNumber( (float)value / (float)m_factor, 4 );
+	return TDEGlobal::locale()->formatNumber( (float)value / (float)m_factor, 4 );
 }
 
 int KFloatSpinBox::mapTextToValue( bool * ok )
 {
-	return (int)( m_factor * KGlobal::locale()->readNumber( text(), ok ) );
+	return (int)( m_factor * TDEGlobal::locale()->readNumber( text(), ok ) );
 }
 
 void KFloatSpinBox::valueChange()