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

6 files changed, 18 insertions, 18 deletions

diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 65e3a55a..2f1f857f 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -842,7 +842,7 @@ TQString PDFGenerator::getDocumentDate( const TQString & data ) const
             TQDate d( year, mon, day );  //CHECK: it was mon-1, Jan->0 (??)
             TQTime t( hour, min, sec );
             if ( d.isValid() && t.isValid() )
-                result = KGlobal::locale()->formatDateTime( TQDateTime(d, t), false, true );
+                result = TDEGlobal::locale()->formatDateTime( TQDateTime(d, t), false, true );
             else
                 result = s;
         }
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 9b798526..43373047 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -127,7 +127,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(emitWindowCaption()));
 	
 	// load catalog for translation
-	KGlobal::locale()->insertCatalogue("kpdf");
+	TDEGlobal::locale()->insertCatalogue("kpdf");
 
 	// create browser extension (for printing when embedded into browser)
 	m_bExtension = new BrowserExtension(this);
@@ -428,11 +428,11 @@ bool Part::openFile()
                     tf.close();
                     m_temporaryLocalFile = tf.name();
 
-                    KProcess *p = new KProcess;
+                    TDEProcess *p = new TDEProcess;
                     *p << app;
                     *p << m_file << m_temporaryLocalFile;
                     m_pageView->showText(i18n("Converting from ps to pdf..."), 0);
-                    connect(p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(psTransformEnded()));
+                    connect(p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(psTransformEnded()));
                     p -> start();
                     return true;
                 }
diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp
index 9a2f99b1..f89ffc65 100644
--- a/kpdf/shell/shell.cpp
+++ b/kpdf/shell/shell.cpp
@@ -92,7 +92,7 @@ void Shell::init()
   connect( m_part, TQT_SIGNAL( enablePrintAction(bool) ), m_printAction, TQT_SLOT( setEnabled(bool)));
   
   readSettings();
-  if (!KGlobal::config()->hasGroup("MainWindow"))
+  if (!TDEGlobal::config()->hasGroup("MainWindow"))
   {
     KMainWindowInterface kmwi(this);
     kmwi.maximize();
@@ -127,21 +127,21 @@ void Shell::openURL( const KURL & url )
 
 void Shell::readSettings()
 {
-    m_recent->loadEntries( KGlobal::config() );
+    m_recent->loadEntries( TDEGlobal::config() );
     m_recent->setEnabled( true ); // force enabling
     m_recent->setToolTip( i18n("Click to open a file\nClick and hold to open a recent file") );
 
-    KGlobal::config()->setDesktopGroup();
-    bool fullScreen = KGlobal::config()->readBoolEntry( "FullScreen", false );
+    TDEGlobal::config()->setDesktopGroup();
+    bool fullScreen = TDEGlobal::config()->readBoolEntry( "FullScreen", false );
     setFullScreen( fullScreen );
 }
 
 void Shell::writeSettings()
 {
-    m_recent->saveEntries( KGlobal::config() );
-    KGlobal::config()->setDesktopGroup();
-    KGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked());
-    KGlobal::config()->sync();
+    m_recent->saveEntries( TDEGlobal::config() );
+    TDEGlobal::config()->setDesktopGroup();
+    TDEGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked());
+    TDEGlobal::config()->sync();
 }
 
 void Shell::setupActions()
@@ -204,7 +204,7 @@ Shell::optionsConfigureToolbars()
   void
 Shell::applyNewToolbarConfig()
 {
-  applyMainWindowSettings(KGlobal::config(), "MainWindow");
+  applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
 }
 
 void Shell::slotQuit()
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 9642f7a9..cc40fdb2 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -1513,7 +1513,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
     {
         case ZoomFixed:{ //ZoomFixed case
             TQString z = d->aZoom->currentText();
-            newFactor = KGlobal::locale()->readNumber( z.remove( z.find( '%' ), 1 ) ) / 100.0;
+            newFactor = TDEGlobal::locale()->readNumber( z.remove( z.find( '%' ), 1 ) ) / 100.0;
             }break;
         case ZoomIn:
             newFactor += (newFactor > 0.99) ? ( newFactor > 1.99 ? 0.5 : 0.2 ) : 0.1;
@@ -1597,8 +1597,8 @@ void PageView::updateZoomText()
             inserted = true;
         if ( !inserted )
             selIdx++;
-        TQString localValue( KGlobal::locale()->formatNumber( value * 100.0, 2 ) );
-        localValue.remove( KGlobal::locale()->decimalSymbol() + double_oh );
+        TQString localValue( TDEGlobal::locale()->formatNumber( value * 100.0, 2 ) );
+        localValue.remove( TDEGlobal::locale()->decimalSymbol() + double_oh );
         translated << TQString( "%1%" ).arg( localValue );
     }
     d->aZoom->setItems( translated );
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 865d8e50..6639dbc5 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -299,7 +299,7 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
 {
     if (m_width == -1)
     {
-        TQRect d = KGlobalSettings::desktopGeometry(this);
+        TQRect d = TDEGlobalSettings::desktopGeometry(this);
         m_width = d.width();
         m_height = d.height();
 
diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp
index 718a0635..e00d8cfe 100644
--- a/kpdf/ui/propertiesdialog.cpp
+++ b/kpdf/ui/propertiesdialog.cpp
@@ -88,7 +88,7 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
     width = TQMAX( width, page2Layout->sizeHint().width() + marginHint() + spacingHint() + 31 );
   }
   // stay inside the 2/3 of the screen width
-  TQRect screenContainer = KGlobalSettings::desktopGeometry( this );
+  TQRect screenContainer = TDEGlobalSettings::desktopGeometry( this );
   width = TQMIN( width, 2*screenContainer.width()/3 );
   resize(width, 1);
 }