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

7 files changed, 14 insertions, 14 deletions

diff --git a/kbarcode/encodingcombo.cpp b/kbarcode/encodingcombo.cpp
index 0904df8..77fc00e 100644
--- a/kbarcode/encodingcombo.cpp
+++ b/kbarcode/encodingcombo.cpp
@@ -25,15 +25,15 @@
 EncodingCombo::EncodingCombo( TQWidget* parent )
     : KComboBox( parent )
 {
-    TQString sEncoding = TQString( KGlobal::locale()->encoding() );
-    TQStringList encodings (KGlobal::charsets()->availableEncodingNames());
+    TQString sEncoding = TQString( TDEGlobal::locale()->encoding() );
+    TQStringList encodings (TDEGlobal::charsets()->availableEncodingNames());
 
     this->insertStringList( encodings );
 
     for (int i=0; i < encodings.count(); i++)
     {
         bool found = false;
-        TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(encodings[i], found);
+        TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(encodings[i], found);
         if (found && ( (codecForEnc->name() == sEncoding) || (encodings[i] == sEncoding) ) )
         {
             this->setCurrentItem(i);
diff --git a/kbarcode/main.cpp b/kbarcode/main.cpp
index 55ce62a..59cbf93 100644
--- a/kbarcode/main.cpp
+++ b/kbarcode/main.cpp
@@ -54,7 +54,7 @@ void setupDirs()
 {
     if( locate("data", "kbarcode/logo.png").isEmpty() ) {
         // Maybe KBarcode was not installed into $TDEDIR
-        KStandardDirs* dirs = KGlobal::dirs();
+        KStandardDirs* dirs = TDEGlobal::dirs();
         TQString tdedir = dirs->kfsstnd_prefixes();
 
         if( !tdedir.contains( "/usr/local/" ) )
diff --git a/kbarcode/measurements.cpp b/kbarcode/measurements.cpp
index a945406..84712d6 100644
--- a/kbarcode/measurements.cpp
+++ b/kbarcode/measurements.cpp
@@ -46,10 +46,10 @@ TQString Measurements::m_string = TQString();
 void Measurements::init()
 {
     if( m_system == None ) {
-        m_system = KGlobal::locale()->measureSystem();
+        m_system = TDEGlobal::locale()->measureSystem();
         m_string = (m_system == Metric) ?
-                   KGlobal::staticQString( i18n("mm" ) ) :
-                   KGlobal::staticQString( i18n("in" ) );
+                   TDEGlobal::staticQString( i18n("mm" ) ) :
+                   TDEGlobal::staticQString( i18n("in" ) );
     }
 }
 
diff --git a/kbarcode/mybarcode.cpp b/kbarcode/mybarcode.cpp
index 04fc22b..6c4f823 100644
--- a/kbarcode/mybarcode.cpp
+++ b/kbarcode/mybarcode.cpp
@@ -117,7 +117,7 @@ bool BarCode::createPixmap( TQPixmap* target, int resx, int resy )
              << "-b" << KShellProcess::quote( m_value ) << flag
              << "-e" << barcode.type << "-o" << output->name();
 
-        proc.start( KProcess::Block, KProcess::NoCommunication );
+        proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
         proc.resume();
 
         if( proc.exitStatus() ) {
@@ -143,7 +143,7 @@ bool BarCode::createPixmap( TQPixmap* target, int resx, int resy )
           << "-sDEVICE=pbmraw" << "-sOutputFile=" + input->name() << "-sNOPAUSE"
           << "-q " + output->name() << "-c showpage" << "-c quit";
     
-    proc2.start( KProcess::Block, KProcess::NoCommunication );
+    proc2.start( TDEProcess::Block, TDEProcess::NoCommunication );
     proc2.resume();
 
     if( proc2.exitStatus() ) {
@@ -220,7 +220,7 @@ bool BarCode::createPdf417( KTempFile* output )
          << barcode.pdf417.col
          << barcode.pdf417.err;
          
-    proc.start( KProcess::Block, KProcess::NoCommunication );
+    proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
     proc.resume();
 
     if( proc.exitStatus() ) {
@@ -257,7 +257,7 @@ bool BarCode::createTBarcode( KTempFile* output )
                                            .arg( barcode.pdf417.err );
         
     proc << barcode.type << "tPS" << TQString("c%1").arg( barcode.tbarcode.checksum ) << flag << "d" + KShellProcess::quote(  m_value );
-    proc.start( KProcess::Block, KProcess::NoCommunication );
+    proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
     proc.resume();
 
     if( proc.exitStatus() )
diff --git a/kbarcode/mybarcode.h b/kbarcode/mybarcode.h
index 2ba514e..ae12782 100644
--- a/kbarcode/mybarcode.h
+++ b/kbarcode/mybarcode.h
@@ -141,7 +141,7 @@ typedef struct barcodeFormat {
     unsigned int features;
 };
 
-class KProcess;
+class TDEProcess;
 class KTempFile;
 class TQPaintDevice;
 /**
diff --git a/kbarcode/pixmapbarcode.cpp b/kbarcode/pixmapbarcode.cpp
index ebade80..2601787 100644
--- a/kbarcode/pixmapbarcode.cpp
+++ b/kbarcode/pixmapbarcode.cpp
@@ -370,7 +370,7 @@ bool PixmapBarcode::createPdf417( KTempFile* output )
          << options->col()
          << options->err();
          
-    proc.start( KProcess::Block, KProcess::NoCommunication );
+    proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
     proc.resume();
 
     if( proc.exitStatus() ) {
diff --git a/kbarcode/printersettings.cpp b/kbarcode/printersettings.cpp
index e4d8db0..6f63b1a 100644
--- a/kbarcode/printersettings.cpp
+++ b/kbarcode/printersettings.cpp
@@ -119,7 +119,7 @@ void PrinterSettings::loadConfig()
     // get default page size from KDE
     if( lpdata->format == -1 )
         for( unsigned int i = 0; i < sizeof( pageFormatInfo ) / sizeof( PageFormatInfo ); i++ )
-            if( pageFormatInfo[i].kprinter == KGlobal::locale()->pageSize() ) {
+            if( pageFormatInfo[i].kprinter == TDEGlobal::locale()->pageSize() ) {
                 lpdata->format = i;
                 break;
             }