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

5 files changed, 12 insertions, 12 deletions

diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc
index a88e3bcd..1bdab489 100644
--- a/kexi/3rdparty/kolibs/koGlobal.cc
+++ b/kexi/3rdparty/kolibs/koGlobal.cc
@@ -48,15 +48,15 @@ KoGlobal::KoGlobal()
     : m_pointSize( -1 ), m_kofficeConfig( 0L )
 {
     // Install the libkoffice* translations
-    KGlobal::locale()->insertCatalogue("koffice");
+    TDEGlobal::locale()->insertCatalogue("koffice");
 
     KImageIO::registerFormats();
 
     // Tell KStandardDirs about the koffice prefix
-    KGlobal::dirs()->addPrefix(PREFIX);
+    TDEGlobal::dirs()->addPrefix(PREFIX);
 
     // Tell the iconloader about share/apps/koffice/icons
-    KGlobal::iconLoader()->addAppDir("koffice");
+    TDEGlobal::iconLoader()->addAppDir("koffice");
 
     // Another way to get the DPI of the display would be TQPaintDeviceMetrics,
     // but we have no widget here (and moving this to KoView wouldn't allow
@@ -77,7 +77,7 @@ KoGlobal::~KoGlobal()
 
 TQFont KoGlobal::_defaultFont()
 {
-    TQFont font = KGlobalSettings::generalFont();
+    TQFont font = TDEGlobalSettings::generalFont();
     // we have to use TQFontInfo, in case the font was specified with a pixel size
     if ( font.pointSize() == -1 )
     {
@@ -132,7 +132,7 @@ void KoGlobal::createListOfLanguages()
     // Many of them are already in all_languages but all_languages doesn't
     // currently have en_GB or en_US etc.
 
-    const TQStringList translationList = KGlobal::dirs()->findAllResources("locale",
+    const TQStringList translationList = TDEGlobal::dirs()->findAllResources("locale",
                                                             TQString::fromLatin1("*/entry.desktop"));
     for ( TQStringList::ConstIterator it = translationList.begin();
           it != translationList.end(); ++it )
diff --git a/kexi/3rdparty/kolibs/koGlobal.h b/kexi/3rdparty/kolibs/koGlobal.h
index 367a150b..cad645b4 100644
--- a/kexi/3rdparty/kolibs/koGlobal.h
+++ b/kexi/3rdparty/kolibs/koGlobal.h
@@ -33,7 +33,7 @@ class KOFFICECORE_EXPORT KoGlobal
 public:
     /// For KoApplication
     static void initialize()  {
-        (void)self(); // I don't want to make KGlobal instances public, so self() is private
+        (void)self(); // I don't want to make TDEGlobal instances public, so self() is private
     }
     /**
      * Return the default font for KOffice programs.
diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp
index 316eba19..b4640a30 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.cpp
+++ b/kexi/3rdparty/kolibs/koPageLayout.cpp
@@ -217,7 +217,7 @@ KoFormat KoPageFormat::formatFromString( const TQString & string )
 
 KoFormat KoPageFormat::defaultFormat()
 {
-    int kprinter = KGlobal::locale()->pageSize();
+    int kprinter = TDEGlobal::locale()->pageSize();
     for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i )
     {
         if ( pageFormatInfo[ i ].kprinter == kprinter )
diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc
index e8dd16ff..38c8b111 100644
--- a/kexi/3rdparty/kolibs/koUnit.cc
+++ b/kexi/3rdparty/kolibs/koUnit.cc
@@ -116,7 +116,7 @@ double KoUnit::ptToUnit( const double ptValue, const Unit unit )
 
 TQString KoUnit::toUserStringValue( double ptValue, Unit unit )
 {
-    return KGlobal::locale()->formatNumber( toUserValue( ptValue, unit ) );
+    return TDEGlobal::locale()->formatNumber( toUserValue( ptValue, unit ) );
 }
 
 double KoUnit::fromUserValue( double value, Unit unit )
@@ -144,7 +144,7 @@ double KoUnit::fromUserValue( double value, Unit unit )
 
 double KoUnit::fromUserValue( const TQString& value, Unit unit, bool* ok )
 {
-    return fromUserValue( KGlobal::locale()->readNumber( value, ok ), unit );
+    return fromUserValue( TDEGlobal::locale()->readNumber( value, ok ), unit );
 }
 
 double KoUnit::parseValue( TQString value, double defaultVal )
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 73a55822..13ddf55b 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc
@@ -89,7 +89,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const
 
 TQString KoUnitDoubleBase::getVisibleText( double value ) const
 {
-    const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
+    const TQString num ( TQString( "%1%2").arg( TDEGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
     kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl;
     return num;
 }
@@ -99,11 +99,11 @@ double KoUnitDoubleBase::toDouble( const TQString& str, bool* ok ) const
     TQString str2( str );
     /* KLocale::readNumber wants the thousand separator exactly at 1000.
        But when editing, it might be anywhere. So we need to remove it. */
-    const TQString sep( KGlobal::locale()->thousandsSeparator() );
+    const TQString sep( TDEGlobal::locale()->thousandsSeparator() );
     if ( !sep.isEmpty() )
         str2.remove( sep );
     str2.remove( KoUnit::unitName( m_unit ) );
-    const double dbl = KGlobal::locale()->readNumber( str2, ok );
+    const double dbl = TDEGlobal::locale()->readNumber( str2, ok );
     if ( ok )
       kdDebug(30004) << "toDouble:" << str << ": => :" << str2 << ": => " << TQString::number( dbl, 'f', 12 ) << endl;
     else