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

8 files changed, 48 insertions, 48 deletions

diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index 08619841..b8a57a6e 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -264,8 +264,8 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     for ( TQValueList<double>::iterator first = mags.begin(), last = mags.end();
 	    first != last;
 	    ++first ) {
-        TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
-        str.remove( KGlobal::locale()->decimalSymbol() + "00" );
+        TQString str = TQString( "%1%" ).arg( TDEGlobal::locale()->formatNumber( *first * 100.0, 2 ));
+        str.remove( TDEGlobal::locale()->decimalSymbol() + "00" );
         zooms << str;
 	if ( *first == 1.0 ) idx = cur;
 	++cur;
@@ -600,8 +600,8 @@ void KGVPart::updateZoomActions()
     }
 
     // Show percentage that isn't predefined
-    TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( zoom, 2 ));
-    str.remove( KGlobal::locale()->decimalSymbol() + "00" );
+    TQString str = TQString( "%1%" ).arg( TDEGlobal::locale()->formatNumber( zoom, 2 ));
+    str.remove( TDEGlobal::locale()->decimalSymbol() + "00" );
     items.insert( items.at(idx), 1, str );
     _zoomTo->setItems( items );
     _zoomTo->setCurrentItem( idx );
@@ -902,7 +902,7 @@ void KGVPart::slotZoom( const TQString& nz )
     TQString z = nz;
     double zoom;
     z.remove(  z.find(  '%' ), 1 );
-    zoom = KGlobal::locale()->readNumber(  z ) / 100;
+    zoom = TDEGlobal::locale()->readNumber(  z ) / 100;
     kdDebug( 4500 ) << "ZOOM = "  << nz << ", setting zoom = " << zoom << endl;
 
     DisplayOptions options = miniWidget()->displayOptions();
diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp
index 3fb7e1b4..3333a845 100644
--- a/kghostview/kgvconfigdialog.cpp
+++ b/kghostview/kgvconfigdialog.cpp
@@ -46,7 +46,7 @@ namespace {
     TQString getGSVersion( TQString fullPathToExec )
     {
 	TQString res;
-	TQString chkVersion = KProcess::quote(fullPathToExec) + " --version";
+	TQString chkVersion = TDEProcess::quote(fullPathToExec) + " --version";
 	FILE* p = popen( TQFile::encodeName(chkVersion), "r" );
 	if( p ) {
 	    // FIXME: a badly configured interpreter can hang us
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index 681724a4..96ff7e96 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -345,7 +345,7 @@ bool KGVDocument::convertFromPDF( const TQString& saveFileName,
 {
     // TODO -- timeout/fail on this conversion (it can hang on a bad pdf)
     // TODO -- use output from gs (leave out -q) to drive a progress bar
-    KProcess process;
+    TDEProcess process;
     process << _interpreterPath
             << "-q"
             << "-dNOPAUSE"
@@ -367,7 +367,7 @@ bool KGVDocument::convertFromPDF( const TQString& saveFileName,
     for ( ; it != args.end() ; ++it )
         kdDebug(4500) << ( *it ) << endl;*/
 
-    if( !process.start( KProcess::Block ) )
+    if( !process.start( TDEProcess::Block ) )
     {
 	kdError() << "convertFromPDF: Couldn't start gs process" << endl;
 	// TODO -- error message (gs not found?)
@@ -771,7 +771,7 @@ bool KGVDocument::psCopyDoc( const TQString& inputFile,
 void KGVDocument::runPdf2ps( const TQString& pdfName, 
                                const TQString& dscName )
 {
-    KProcess process;
+    TDEProcess process;
     process << _interpreterPath
 	    << "-dNODISPLAY"
 	    << "-dQUIET"
@@ -786,14 +786,14 @@ e=%1" ).arg( dscName )
 	    << "-c"
 	    << "quit";
 
-    connect( &process, TQT_SIGNAL( processExited( KProcess* ) ),
-	     this, TQT_SLOT( pdf2psExited( KProcess* ) ) );
+    connect( &process, TQT_SIGNAL( processExited( TDEProcess* ) ),
+	     this, TQT_SLOT( pdf2psExited( TDEProcess* ) ) );
 
     kdDebug(4500) << "KGVDocument: pdf2ps started" << endl;
-    process.start( KProcess::NotifyOnExit );
+    process.start( TDEProcess::NotifyOnExit );
 }
 
-void KGVDocument::pdf2psExited( KProcess* process )
+void KGVDocument::pdf2psExited( TDEProcess* process )
 {
     kdDebug(4500) << "KGVDocument: pdf2ps exited" << endl;
     
@@ -816,7 +816,7 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName )
 {
     kill();
 
-    _process = new KProcess;
+    _process = new TDEProcess;
     *_process << _ghostscriptPath
               << "-dSAFER"
               << "-dPARANOIDSAFER"
@@ -832,11 +832,11 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName )
               << "-c"
               << "quit";
 
-    connect( _process, TQT_SIGNAL( processExited( KProcess* ) ),
+    connect( _process, TQT_SIGNAL( processExited( TDEProcess* ) ),
 	     this, TQT_SLOT( processExited() ) );
 
     kdDebug(4500) << "Pdf2dsc: started" << endl;
-    _process->start( KProcess::NotifyOnExit );
+    _process->start( TDEProcess::NotifyOnExit );
 }
 
 void Pdf2dsc::kill()
diff --git a/kghostview/kgvdocument.h b/kghostview/kgvdocument.h
index c207d627..3a9764f3 100644
--- a/kghostview/kgvdocument.h
+++ b/kghostview/kgvdocument.h
@@ -176,7 +176,7 @@ protected slots:
     void processExited();
 
 private:
-    KProcess* _process;
+    TDEProcess* _process;
     TQString   _ghostscriptPath;
 };
 
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index d6a2fe4f..9bb974e2 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -193,7 +193,7 @@ KGVShell::saveProperties( KConfig* config )
 void
 KGVShell::readSettings()
 {
-    recent->loadEntries( KGlobal::config() );
+    recent->loadEntries( TDEGlobal::config() );
     TQStringList items = recent->items();
 
 // Code copied from kviewshell.cpp:
@@ -210,10 +210,10 @@ KGVShell::readSettings()
         }
     }
 
-    applyMainWindowSettings(KGlobal::config(), "MainWindow");
+    applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
 
-    KGlobal::config()->setDesktopGroup();
-    bool fullScreen = KGlobal::config()->readBoolEntry( "FullScreen", false );
+    TDEGlobal::config()->setDesktopGroup();
+    bool fullScreen = TDEGlobal::config()->readBoolEntry( "FullScreen", false );
     setFullScreen( fullScreen );
     _showMenuBarAction->setChecked( menuBar()->isVisible() );
 }
@@ -221,14 +221,14 @@ KGVShell::readSettings()
 void
 KGVShell::writeSettings()
 {
-    saveMainWindowSettings(KGlobal::config(), "MainWindow");
+    saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
 
-    recent->saveEntries( KGlobal::config() );
+    recent->saveEntries( TDEGlobal::config() );
 
-    KGlobal::config()->setDesktopGroup();
-    KGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked());
+    TDEGlobal::config()->setDesktopGroup();
+    TDEGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked());
 
-    KGlobal::config()->sync();
+    TDEGlobal::config()->sync();
 }
 
 void
@@ -350,7 +350,7 @@ void KGVShell::slotUpdateFullScreen()
 
 void KGVShell::slotConfigureToolbars()
 {
-    saveMainWindowSettings( KGlobal::config(), "MainWindow" );
+    saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
     KEditToolbar dlg( factory() );
     connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
     dlg.exec();
@@ -358,7 +358,7 @@ void KGVShell::slotConfigureToolbars()
 
 void KGVShell::slotNewToolbarConfig()
 {
-    applyMainWindowSettings( KGlobal::config(), "MainWindow" );
+    applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
 }
 
 void KGVShell::slotRMBClick()
diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp
index eafd3831..a5e66757 100644
--- a/kghostview/kpswidget.cpp
+++ b/kghostview/kpswidget.cpp
@@ -342,7 +342,7 @@ bool KPSWidget::startInterpreter()
 {
     setupWidget();
 
-    _process = new KProcess;
+    _process = new TDEProcess;
     if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString(  "%1 %2" ).arg( winId() ).arg( _backgroundPixmap.handle() ) );
     else _process->setEnvironment( "GHOSTVIEW", TQString::number( winId() ) );
 
@@ -358,21 +358,21 @@ bool KPSWidget::startInterpreter()
     else
 	*_process << _fileName << "-c" << "quit";
 
-    connect( _process, TQT_SIGNAL( processExited( KProcess* ) ),
-             this, TQT_SLOT( slotProcessExited( KProcess* ) ) );
-    connect( _process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
-             this, TQT_SLOT( gs_output( KProcess*, char*, int ) ) );
-    connect( _process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
-             this, TQT_SLOT( gs_output( KProcess*, char*, int ) ) );
-    connect( _process, TQT_SIGNAL( wroteStdin( KProcess*) ),
-             this, TQT_SLOT( gs_input( KProcess* ) ) );
+    connect( _process, TQT_SIGNAL( processExited( TDEProcess* ) ),
+             this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
+    connect( _process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+             this, TQT_SLOT( gs_output( TDEProcess*, char*, int ) ) );
+    connect( _process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+             this, TQT_SLOT( gs_output( TDEProcess*, char*, int ) ) );
+    connect( _process, TQT_SIGNAL( wroteStdin( TDEProcess*) ),
+             this, TQT_SLOT( gs_input( TDEProcess* ) ) );
 
     kapp->flushX();
 
     // Finally fire up the interpreter.
     kdDebug(4500) << "KPSWidget: starting interpreter" << endl;
-    if( _process->start( KProcess::NotifyOnExit, 
-              _usePipe ? KProcess::All : KProcess::AllOutput ) ) 
+    if( _process->start( TDEProcess::NotifyOnExit, 
+              _usePipe ? TDEProcess::All : TDEProcess::AllOutput ) ) 
     {
 	_interpreterBusy = true;
 	setCursor( waitCursor );
@@ -412,7 +412,7 @@ void KPSWidget::interpreterFailed()
     stopInterpreter();
 }
 
-void KPSWidget::slotProcessExited( KProcess* process )
+void KPSWidget::slotProcessExited( TDEProcess* process )
 {
     kdDebug(4500) << "KPSWidget: process exited" << endl;
 
@@ -430,12 +430,12 @@ void KPSWidget::slotProcessExited( KProcess* process )
     }
 }
 
-void KPSWidget::gs_output( KProcess*, char* buffer, int len )
+void KPSWidget::gs_output( TDEProcess*, char* buffer, int len )
 {
     emit output( buffer, len );
 }
 
-void KPSWidget::gs_input( KProcess* process )
+void KPSWidget::gs_input( TDEProcess* process )
 {
     kdDebug(4500) << "KPSWidget::gs_input" << endl;
 
diff --git a/kghostview/kpswidget.h b/kghostview/kpswidget.h
index 40f8614e..71ffe704 100644
--- a/kghostview/kpswidget.h
+++ b/kghostview/kpswidget.h
@@ -30,7 +30,7 @@
 
 #include <X11/X.h>
 
-class KProcess;
+class TDEProcess;
 
 class KGVConfigDialog;
 class MessagesDialog;
@@ -201,10 +201,10 @@ protected:
     void setPalette( Configuration::EnumPalette::type );
 
 protected slots:
-    void gs_input( KProcess* );
-    void gs_output( KProcess*, char* buffer, int len );
+    void gs_input( TDEProcess* );
+    void gs_output( TDEProcess*, char* buffer, int len );
     void interpreterFailed();
-    void slotProcessExited( KProcess* );
+    void slotProcessExited( TDEProcess* );
 	
 private:
     Window _gsWindow; // Destination of ghostscript messages.
@@ -246,7 +246,7 @@ private:
      */
     bool _widgetDirty;
 
-    KProcess* _process;
+    TDEProcess* _process;
     char* _buffer;
  
     std::queue<Record> _inputQueue;
diff --git a/kghostview/logwindow.cpp b/kghostview/logwindow.cpp
index 207e88f1..82e85a99 100644
--- a/kghostview/logwindow.cpp
+++ b/kghostview/logwindow.cpp
@@ -43,7 +43,7 @@ LogWindow::LogWindow( const TQString& caption,
     _logView->setTextFormat( TQt::PlainText );
     _logView->setReadOnly( true );
     _logView->setWordWrap( TQTextEdit::NoWrap );
-    _logView->setFont( KGlobalSettings::fixedFont() );
+    _logView->setFont( TDEGlobalSettings::fixedFont() );
     _logView->setMinimumWidth( 80 * fontMetrics().width( " " ) );
 
     connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( clear() ) );