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

4 files changed, 16 insertions, 16 deletions

diff --git a/krename/commandplugin.cpp b/krename/commandplugin.cpp
index 46bd554..73f451a 100644
--- a/krename/commandplugin.cpp
+++ b/krename/commandplugin.cpp
@@ -130,9 +130,9 @@ TQString CommandPlugin::processFile( BatchRenamer* b, int i, TQString, int )
     proc << c;
     
     if( noblock )
-        proc.start( KProcess::DontCare, KProcess::NoCommunication );
+        proc.start( TDEProcess::DontCare, TDEProcess::NoCommunication );
     else
-        proc.start( KProcess::Block, KProcess::NoCommunication );
+        proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
 
     proc.resume();
 
diff --git a/krename/kmyhistorycombo.cpp b/krename/kmyhistorycombo.cpp
index e1c8b22..fec4707 100644
--- a/krename/kmyhistorycombo.cpp
+++ b/krename/kmyhistorycombo.cpp
@@ -52,8 +52,8 @@ KMyHistoryCombo::KMyHistoryCombo( bool customPopup, TQWidget* parent, const char
     setHistoryItems( history );
 
     completionObject()->setItems( ( completion.isEmpty() ? history : completion ) );
-    setCompletionMode( (KGlobalSettings::Completion)config->readNumEntry( "CompletionMode",
-                        KGlobalSettings::completionMode() ) );    
+    setCompletionMode( (TDEGlobalSettings::Completion)config->readNumEntry( "CompletionMode",
+                        TDEGlobalSettings::completionMode() ) );    
                         
     connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( textChangedGovernor() ) );
     connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SIGNAL( delayedTextChanged() ) );
diff --git a/krename/undodialog.cpp b/krename/undodialog.cpp
index 487a154..993782e 100644
--- a/krename/undodialog.cpp
+++ b/krename/undodialog.cpp
@@ -77,24 +77,24 @@ void UndoDialog::start()
             == KMessageBox::Cancel )
             return;
 
-    KProcess *proc = new KProcess;
+    TDEProcess *proc = new TDEProcess;
     *proc << scriptname->url() << "--krename";
 
     enableButton( KDialogBase::User1, false );
 
-    if( !proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+    if( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
         KMessageBox::sorry( this, i18n("Unable to start the given undo script!") );
         enableButton( KDialogBase::User1, true );
         delete proc;
         return;
     }
     proc->resume();
-    connect( proc, TQT_SIGNAL( receivedStdout( KProcess*, char*, int) ), this, TQT_SLOT( receive( KProcess*, char*, int ) ) );
-    connect( proc, TQT_SIGNAL( receivedStderr( KProcess*, char*, int) ), this, TQT_SLOT( receiveErr( KProcess*, char*, int ) ) );
-    connect( proc, TQT_SIGNAL( processExited( KProcess* ) ), this, TQT_SLOT( finished( KProcess* ) ) );
+    connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int) ), this, TQT_SLOT( receive( TDEProcess*, char*, int ) ) );
+    connect( proc, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int) ), this, TQT_SLOT( receiveErr( TDEProcess*, char*, int ) ) );
+    connect( proc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( finished( TDEProcess* ) ) );
 }
 
-void UndoDialog::receive( KProcess*, char* buffer, int len )
+void UndoDialog::receive( TDEProcess*, char* buffer, int len )
 {
     TQString text;
     for( int i = 0; i < len; i++ )
@@ -103,7 +103,7 @@ void UndoDialog::receive( KProcess*, char* buffer, int len )
     browser->setText( browser->text() + text + "<br>");
 }
 
-void UndoDialog::receiveErr( KProcess*, char* buffer, int len )
+void UndoDialog::receiveErr( TDEProcess*, char* buffer, int len )
 {
     TQString text = "<b>";
     for( int i = 0; i < len; i++ )
@@ -112,7 +112,7 @@ void UndoDialog::receiveErr( KProcess*, char* buffer, int len )
     browser->setText( browser->text() + text + "</b><br>");
 }
 
-void UndoDialog::finished( KProcess* p )
+void UndoDialog::finished( TDEProcess* p )
 {
     delete p;
     KMessageBox::information( this, i18n("Finished successfully") );
diff --git a/krename/undodialog.h b/krename/undodialog.h
index b0a3252..a33c1bd 100644
--- a/krename/undodialog.h
+++ b/krename/undodialog.h
@@ -21,7 +21,7 @@
 #include <kdialogbase.h>
 
 class KPushButton;
-class KProcess;
+class TDEProcess;
 class KTextBrowser;
 class KURLRequester;
 class TQVBoxLayout;
@@ -42,9 +42,9 @@ class UndoDialog : public KDialogBase
         void start();
     
     private slots:
-        void receive( KProcess*, char* buffer, int len );
-        void receiveErr( KProcess*, char* buffer, int len );
-        void finished( KProcess* p );
+        void receive( TDEProcess*, char* buffer, int len );
+        void receiveErr( TDEProcess*, char* buffer, int len );
+        void finished( TDEProcess* p );
         void enableControls();
         
     private: