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

5 files changed, 21 insertions, 21 deletions

diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
index 639be9bf1..061f8405d 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
@@ -56,7 +56,7 @@ public:
 KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     : KPreviewWidgetBase( parent, name )
 {
-    KGlobal::locale()->insertCatalogue("kfileaudiopreview");    
+    TDEGlobal::locale()->insertCatalogue("kfileaudiopreview");    
 
     TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
     // ###
@@ -91,14 +91,14 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     }
 
     m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
-    KConfigGroup config( KGlobal::config(), ConfigGroup );
+    KConfigGroup config( TDEGlobal::config(), ConfigGroup );
     m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
     connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
 }
 
 KFileAudioPreview::~KFileAudioPreview()
 {
-    KConfigGroup config( KGlobal::config(), ConfigGroup );
+    KConfigGroup config( TDEGlobal::config(), ConfigGroup );
     config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() );
 
     delete d;
diff --git a/interfaces/kscript/sample/shellscript.cpp b/interfaces/kscript/sample/shellscript.cpp
index 49aee0727..9ec34f7a2 100644
--- a/interfaces/kscript/sample/shellscript.cpp
+++ b/interfaces/kscript/sample/shellscript.cpp
@@ -30,10 +30,10 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" )
 
 ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent)
 {
-	m_script =  new KProcess();
-	connect ( m_script, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(Exit(KProcess *)));
-	connect ( m_script, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(stdOut(KProcess *, char *, int )));
-	connect ( m_script, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(stdErr(KProcess *, char *, int )));
+	m_script =  new TDEProcess();
+	connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *)));
+	connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int )));
+	connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int )));
 	// Connect feedback signals and slots
 	//kdDebug() << "Building new script engine" << endl;
 }
@@ -60,7 +60,7 @@ void ShellScript::setScript( const TQString &, const TQString & )
 
 void ShellScript::run(TQObject *, const TQVariant &)
 {
-	 m_script->start(KProcess::NotifyOnExit,KProcess::All);
+	 m_script->start(TDEProcess::NotifyOnExit,TDEProcess::All);
 }
 void ShellScript::kill()
 {
@@ -68,16 +68,16 @@ void ShellScript::kill()
 		m_script->kill(9);	// Kill it harder
 }
 
-void ShellScript::Exit(KProcess *proc)
+void ShellScript::Exit(TDEProcess *proc)
 {
 	ScriptClientInterface->done((KScriptClientInterface::Result)proc->exitStatus(), "");
 }
 
-void ShellScript::stdErr(KProcess *, char *buffer, int)
+void ShellScript::stdErr(TDEProcess *, char *buffer, int)
 {
 	ScriptClientInterface->error(buffer);
 }
-void ShellScript::stdOut(KProcess *, char *buffer, int)
+void ShellScript::stdOut(TDEProcess *, char *buffer, int)
 {
 	ScriptClientInterface->output(buffer);
 }
diff --git a/interfaces/kscript/sample/shellscript.h b/interfaces/kscript/sample/shellscript.h
index 853a7bd12..2cdaf7e5a 100644
--- a/interfaces/kscript/sample/shellscript.h
+++ b/interfaces/kscript/sample/shellscript.h
@@ -36,11 +36,11 @@ public:
 	void run(TQObject *context = 0, const TQVariant &arg = 0);
 	void kill();
 private slots:
-	void Exit(KProcess *proc);
-	void stdErr(KProcess *proc, char *buffer, int buflen);
-	void stdOut(KProcess *proc, char *buffer, int buflen);
+	void Exit(TDEProcess *proc);
+	void stdErr(TDEProcess *proc, char *buffer, int buflen);
+	void stdOut(TDEProcess *proc, char *buffer, int buflen);
 private:
-	KProcess *m_script;
+	TDEProcess *m_script;
 	KScriptClientInterface *ScriptClientInterface;
 	TQString m_scriptName;
 };
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp
index 894d23f6a..ecc34c7e2 100644
--- a/interfaces/ktexteditor/templateinterface.cpp
+++ b/interfaces/ktexteditor/templateinterface.cpp
@@ -113,23 +113,23 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
       }
       else if ( placeholder == "date" )
       {
-        map[ placeholder ] = KGlobal::locale() ->formatDate( date, true );
+        map[ placeholder ] = TDEGlobal::locale() ->formatDate( date, true );
       }
       else if ( placeholder == "time" )
       {
-        map[ placeholder ] = KGlobal::locale() ->formatTime( time, true, false );
+        map[ placeholder ] = TDEGlobal::locale() ->formatTime( time, true, false );
       }
       else if ( placeholder == "year" )
       {
-        map[ placeholder ] = KGlobal::locale() ->calendar() ->yearString( date, false );
+        map[ placeholder ] = TDEGlobal::locale() ->calendar() ->yearString( date, false );
       }
       else if ( placeholder == "month" )
       {
-        map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->month( date ) );
+        map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->month( date ) );
       }
       else if ( placeholder == "day" )
       {
-        map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->day( date ) );
+        map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->day( date ) );
       }
       else if ( placeholder == "hostname" )
       {
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index 6a65477c2..0624c0e8d 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -35,7 +35,7 @@ class TQStrList;
  * we can't have signals without having a TQObject, which
  * TerminalInterface is not.
  * These are the signals you can connect to:
- *  void processExited( KProcess *process );
+ *  void processExited( TDEProcess *process );
  *  void receivedData( const TQString& s );
  * See the example code below for how to connect to these..
  *