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

3 files changed, 13 insertions, 13 deletions

diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index b8d445900..674a3f3c6 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/khtml/ecma/kjs_debugwin.cpp
@@ -77,11 +77,11 @@ using namespace khtml;
 
 SourceDisplay::SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char *name)
   : TQScrollView(parent,name), m_currentLine(-1), m_sourceFile(0), m_debugWin(debugWin),
-    m_font(KGlobalSettings::fixedFont())
+    m_font(TDEGlobalSettings::fixedFont())
 {
   verticalScrollBar()->setLineStep(TQFontMetrics(m_font).height());
   viewport()->setBackgroundMode(TQt::NoBackground);
-  m_breakpointIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
+  m_breakpointIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
 }
 
 SourceDisplay::~SourceDisplay()
@@ -296,7 +296,7 @@ KJSErrorDialog::KJSErrorDialog(TQWidget *parent, const TQString& errorMessage, b
   setMainWidget(page);
 
   TQLabel *iconLabel = new TQLabel("",page);
-  iconLabel->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_critical",
+  iconLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_critical",
 						       KIcon::NoGroup,KIcon::SizeMedium,
 						       KIcon::DefaultState,0,true));
 
@@ -361,7 +361,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   m_execsAlloc = 0;
   m_steppingDepth = 0;
 
-  m_stopIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
+  m_stopIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
   m_emptyIcon = TQPixmap(m_stopIcon.width(),m_stopIcon.height());
   TQBitmap emptyMask(m_stopIcon.width(),m_stopIcon.height(),true);
   m_emptyIcon.setMask(emptyMask);
@@ -376,7 +376,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   // frame list & code
   TQSplitter *hsplitter = new TQSplitter(Qt::Vertical,mainWidget);
   TQSplitter *vsplitter = new TQSplitter(hsplitter);
-  TQFont font(KGlobalSettings::fixedFont());
+  TQFont font(TDEGlobalSettings::fixedFont());
 
   TQWidget *contextContainer = new TQWidget(vsplitter);
 
diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp
index ee36ddd1b..426c68343 100644
--- a/khtml/ecma/kjs_navigator.cpp
+++ b/khtml/ecma/kjs_navigator.cpp
@@ -240,7 +240,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
   case BrowserLanguage:
   case Language:
   case UserLanguage:
-    return String(KGlobal::locale()->language());
+    return String(TDEGlobal::locale()->language());
   case UserAgent:
     return String(userAgent);
   case Platform:
diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index 8d96380ab..e557497e0 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -165,7 +165,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
   KWinModule info(0, KWinModule::INFO_DESKTOP);
 #endif
   TQWidget *thisWidget = Window::retrieveActive(exec)->part()->widget();
-  TQRect sg = KGlobalSettings::desktopGeometry(thisWidget);
+  TQRect sg = TDEGlobalSettings::desktopGeometry(thisWidget);
 
   switch( token ) {
   case Height:
@@ -882,14 +882,14 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     case ScreenX: {
       if (!part->view())
         return Undefined();
-      TQRect sg = KGlobalSettings::desktopGeometry(part->view());
+      TQRect sg = TDEGlobalSettings::desktopGeometry(part->view());
       return Number(part->view()->mapToGlobal(TQPoint(0,0)).x() + sg.x());
     }
     case ScreenTop:
     case ScreenY: {
       if (!part->view())
         return Undefined();
-      TQRect sg = KGlobalSettings::desktopGeometry(part->view());
+      TQRect sg = TDEGlobalSettings::desktopGeometry(part->view());
       return Number(part->view()->mapToGlobal(TQPoint(0,0)).y() + sg.y());
     }
     case ScrollX: {
@@ -1504,7 +1504,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height)
     return;
   }
 
-  TQRect sg = KGlobalSettings::desktopGeometry(tl);
+  TQRect sg = TDEGlobalSettings::desktopGeometry(tl);
 
   if ( width > sg.width() || height > sg.height() ) {
     kdDebug(6070) << "Window::resizeTo refused, window would be too big ("<<width<<","<<height<<")" << endl;
@@ -1622,7 +1622,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
         if (pos >= 0) {
           key = s.left(pos).stripWhiteSpace().lower();
           val = s.mid(pos + 1).stripWhiteSpace().lower();
-          TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget());
+          TQRect screen = TDEGlobalSettings::desktopGeometry(widget->topLevelWidget());
 
           if (key == "left" || key == "screenx") {
             winargs.x = (int)val.toFloat() + screen.x();
@@ -1951,7 +1951,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
       KParts::BrowserExtension *ext = part->browserExtension();
       if (ext) {
         TQWidget * tl = widget->topLevelWidget();
-        TQRect sg = KGlobalSettings::desktopGeometry(tl);
+        TQRect sg = TDEGlobalSettings::desktopGeometry(tl);
 
         TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) );
         // Security check (the spec talks about UniversalBrowserWrite to disable this check...)
@@ -1971,7 +1971,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
       KParts::BrowserExtension *ext = part->browserExtension();
       if (ext) {
         TQWidget * tl = widget->topLevelWidget();
-        TQRect sg = KGlobalSettings::desktopGeometry(tl);
+        TQRect sg = TDEGlobalSettings::desktopGeometry(tl);
 
         TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() );
         // Security check (the spec talks about UniversalBrowserWrite to disable this check...)