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

1 files changed, 7 insertions, 7 deletions

diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp
index c968f235c..2a58fc54c 100644
--- a/libtdepim/ktimeedit.cpp
+++ b/libtdepim/ktimeedit.cpp
@@ -53,7 +53,7 @@ public:
             return Intermediate;
 
         bool ok = false;
-        /*TQTime time =*/ KGlobal::locale()->readTime(str, KLocale::WithoutSeconds, &ok);
+        /*TQTime time =*/ TDEGlobal::locale()->readTime(str, KLocale::WithoutSeconds, &ok);
         if ( ok )
             return Acceptable;
 //         kdDebug(5300)<<"Time "<<str<<" not directly acceptable, trying military format "<<endl;
@@ -91,12 +91,12 @@ public:
     }
     virtual void fixup ( TQString & input ) const {
       bool ok = false;
-      KGlobal::locale()->readTime( input, KLocale::WithoutSeconds, &ok );
+      TDEGlobal::locale()->readTime( input, KLocale::WithoutSeconds, &ok );
       if ( !ok ) {
         // Also try to accept times in "military format", i.e. no delimiter, like 1200
         int tm = input.toInt( &ok );
         if ( ( 0 <= tm ) && ( tm < 2400 ) && ( tm%100 < 60 ) && ok ) {
-          input = KGlobal::locale()->formatTime( TQTime( tm / 100, tm % 100, 0 ) );
+          input = TDEGlobal::locale()->formatTime( TQTime( tm / 100, tm % 100, 0 ) );
         }
       }
     }
@@ -119,11 +119,11 @@ KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name )
   // Fill combo box with selection of times in localized format.
   TQTime timeEntry(0,0,0);
   do {
-    insertItem(KGlobal::locale()->formatTime(timeEntry));
+    insertItem(TDEGlobal::locale()->formatTime(timeEntry));
     timeEntry = timeEntry.addSecs(60*15);
   } while (!timeEntry.isNull());
   // Add end of day.
-  insertItem( KGlobal::locale()->formatTime( TQTime( 23, 59, 59 ) ) );
+  insertItem( TDEGlobal::locale()->formatTime( TQTime( 23, 59, 59 ) ) );
 
   updateText();
   setFocusPolicy(TQ_StrongFocus);
@@ -151,7 +151,7 @@ TQTime KTimeEdit::getTime() const
   //kdDebug(5300) << "KTimeEdit::getTime(), currentText() = " << currentText() << endl;
   // TODO use KLocale::WithoutSeconds in HEAD
   bool ok = false;
-  TQTime time = KGlobal::locale()->readTime( currentText(), KLocale::WithoutSeconds, &ok );
+  TQTime time = TDEGlobal::locale()->readTime( currentText(), KLocale::WithoutSeconds, &ok );
   if ( !ok ) {
     // Also try to accept times in "military format", i.e. no delimiter, like 1200
     int tm = currentText().toInt( &ok );
@@ -257,7 +257,7 @@ void KTimeEdit::keyPressEvent(TQKeyEvent *qke)
 void KTimeEdit::updateText()
 {
 //  kdDebug(5300) << "KTimeEdit::updateText() " << endl;
-  TQString s = KGlobal::locale()->formatTime(mTime);
+  TQString s = TDEGlobal::locale()->formatTime(mTime);
   // Set the text but without emitting signals, nor losing the cursor position
   TQLineEdit *line = lineEdit();
   line->blockSignals(true);