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

4 files changed, 12 insertions, 12 deletions

diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp
index 4418538..50b5272 100644
--- a/src/gui/doublespinbox.cpp
+++ b/src/gui/doublespinbox.cpp
@@ -146,7 +146,7 @@ double DoubleSpinBox::getMult()
 
 double DoubleSpinBox::getDisplayedNumber( bool * ok )
 {
-	KLocale * locale = KGlobal::locale();
+	KLocale * locale = TDEGlobal::locale();
 	
 	// Fetch the characters that we don't want to discard
 	const TQString exclude = locale->decimalSymbol()
@@ -194,7 +194,7 @@ TQString DoubleSpinBox::mapValueToText( int v )
 	else if ( leftDigits > 3 )
 		leftDigits = 3;
 	
-	KLocale * locale = KGlobal::locale();
+	KLocale * locale = TDEGlobal::locale();
 	return locale->formatNumber( val, 3-leftDigits );
 }
 
diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp
index 9da23e2..87159c1 100644
--- a/src/gui/newfiledlg.cpp
+++ b/src/gui/newfiledlg.cpp
@@ -43,7 +43,7 @@ NewFileDlg::NewFileDlg( TQWidget *parent )
 	 m_pNewFileWidget->typeIconView->setSelectionMode(TQIconView::Single);
 	 m_pNewFileWidget->typeIconView->setMode(KIconView::Select);
     
-	KIconLoader *loader = KGlobal::iconLoader();
+	KIconLoader *loader = TDEGlobal::iconLoader();
 	
 	TQValueList<TQIconViewItem*> items;
 	
diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp
index 6206134..2935e7a 100644
--- a/src/gui/oscilloscope.cpp
+++ b/src/gui/oscilloscope.cpp
@@ -82,8 +82,8 @@ Oscilloscope::Oscilloscope( KateMDI::ToolView * parent )
 	connect( updateScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollbars()) );
 	updateScrollTmr->start(20);
 	
-	KGlobal::config()->setGroup("Oscilloscope");
-	setZoomLevel( KGlobal::config()->readDoubleNumEntry( "ZoomLevel", 0.5 ) );
+	TDEGlobal::config()->setGroup("Oscilloscope");
+	setZoomLevel( TDEGlobal::config()->readDoubleNumEntry( "ZoomLevel", 0.5 ) );
 	
 	connect( this, TQT_SIGNAL(probeRegistered(int, ProbeData *)), probePositioner, TQT_SLOT(slotProbeDataRegistered(int, ProbeData *)) );
 	connect( this, TQT_SIGNAL(probeUnregistered(int )), probePositioner, TQT_SLOT(slotProbeDataUnregistered(int )) );
@@ -119,8 +119,8 @@ void Oscilloscope::setZoomLevel( double zoomLevel )
 	else if ( zoomLevel > 1.0 )
 		zoomLevel = 1.0;
 	
-	KGlobal::config()->setGroup("Oscilloscope");
-	KGlobal::config()->writeEntry( "ZoomLevel", zoomLevel );
+	TDEGlobal::config()->setGroup("Oscilloscope");
+	TDEGlobal::config()->writeEntry( "ZoomLevel", zoomLevel );
 	
 	// We want to maintain the position of the *center* of the view, not the
 	// left edge, so have to record time at center of view... We also have to
@@ -332,7 +332,7 @@ void addOscilloscopeAsToolView( KTechlab *ktechlab )
 	KateMDI::ToolView * tv;
 	tv = ktechlab->createToolView( Oscilloscope::toolViewIdentifier(),
 								   KMultiTabBar::Bottom,
-								   KGlobal::iconLoader()->loadIcon( "oscilloscope", KIcon::Small ),
+								   TDEGlobal::iconLoader()->loadIcon( "oscilloscope", KIcon::Small ),
 								   i18n("Oscilloscope") );
 	
 	Oscilloscope::self(tv);
diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp
index e42af21..b2535ae 100644
--- a/src/gui/oscilloscopeview.cpp
+++ b/src/gui/oscilloscopeview.cpp
@@ -47,8 +47,8 @@ OscilloscopeView::OscilloscopeView( TQWidget *parent, const char *name )
 	m_pSimulator( Simulator::self() ),
 	m_halfOutputHeight(0.0)
 {
-	KGlobal::config()->setGroup("Oscilloscope");
-	m_fps = KGlobal::config()->readNumEntry( "FPS", 25 );
+	TDEGlobal::config()->setGroup("Oscilloscope");
+	m_fps = TDEGlobal::config()->readNumEntry( "FPS", 25 );
 	
 	setBackgroundMode(NoBackground);
 	setMouseTracking(true);
@@ -176,8 +176,8 @@ void OscilloscopeView::mouseReleaseEvent( TQMouseEvent *event )
 void OscilloscopeView::slotSetFrameRate( int fps )
 {
 	m_fps = fps;
-	KGlobal::config()->setGroup("Oscilloscope");
-	KGlobal::config()->writeEntry( "FPS", m_fps );
+	TDEGlobal::config()->setGroup("Oscilloscope");
+	TDEGlobal::config()->writeEntry( "FPS", m_fps );
 }