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

7 files changed, 11 insertions, 11 deletions

diff --git a/chalk/ui/kis_config.cc b/chalk/ui/kis_config.cc
index 6d07790b..4c823ba5 100644
--- a/chalk/ui/kis_config.cc
+++ b/chalk/ui/kis_config.cc
@@ -44,7 +44,7 @@ namespace {
 KisConfig::KisConfig()
 {
 
-    m_cfg = KGlobal::config();
+    m_cfg = TDEGlobal::config();
     if (!m_cfg) {
         // Allow unit tests to test parts of the code without having to run the
         // full application.
@@ -330,7 +330,7 @@ float KisConfig::dockerFontSize()
 
 float KisConfig::getDefaultDockerFontSize()
 {
-    float ps = TQMIN(9, KGlobalSettings::generalFont().pointSize() * 0.8);
+    float ps = TQMIN(9, TDEGlobalSettings::generalFont().pointSize() * 0.8);
     if (ps < 6) ps = 6;
     return ps;
 }
diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc
index 74f3cd0a..b75de805 100644
--- a/chalk/ui/kis_controlframe.cc
+++ b/chalk/ui/kis_controlframe.cc
@@ -96,7 +96,7 @@ KisControlFrame::KisControlFrame( KMainWindow * /*window*/, KisView * view, cons
 {
 
     KisConfig cfg;
-    m_font  = KGlobalSettings::generalFont();
+    m_font  = TDEGlobalSettings::generalFont();
     m_font.setPointSize((int)cfg.dockerFontSize());
 
     m_brushWidget = new KisIconWidget(view, "brushes");
diff --git a/chalk/ui/kis_custom_brush.cc b/chalk/ui/kis_custom_brush.cc
index 34289f3e..d235259f 100644
--- a/chalk/ui/kis_custom_brush.cc
+++ b/chalk/ui/kis_custom_brush.cc
@@ -82,7 +82,7 @@ void KisCustomBrush::slotExport() {
 void KisCustomBrush::slotAddPredefined() {
     // Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/brushes
     // a unique file with this brushname
-    TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/brushes");
+    TQString dir = TDEGlobal::dirs()->saveLocation("data", "chalk/brushes");
     TQString extension;
 
     if (style->currentItem() == 0) {
diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc
index f12b9300..8bd36142 100644
--- a/chalk/ui/kis_custom_palette.cc
+++ b/chalk/ui/kis_custom_palette.cc
@@ -121,7 +121,7 @@ void KisCustomPalette::slotAddPredefined() {
     if (!m_editMode) {
         // Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/palettes
         // a unique file with this palettename
-        TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/palettes");
+        TQString dir = TDEGlobal::dirs()->saveLocation("data", "chalk/palettes");
         TQString extension;
 
         extension = ".gpl";
diff --git a/chalk/ui/kis_custom_pattern.cc b/chalk/ui/kis_custom_pattern.cc
index 538ec9c6..8c2f22e2 100644
--- a/chalk/ui/kis_custom_pattern.cc
+++ b/chalk/ui/kis_custom_pattern.cc
@@ -80,7 +80,7 @@ void KisCustomPattern::slotAddPredefined() {
 
     // Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/patterns
     // a unique file with this pattern name
-    TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/patterns");
+    TQString dir = TDEGlobal::dirs()->saveLocation("data", "chalk/patterns");
     TQString extension;
 
     KTempFile file(dir, ".pat");
diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc
index 2598e79d..daed3a14 100644
--- a/chalk/ui/kis_previewwidget.cc
+++ b/chalk/ui/kis_previewwidget.cc
@@ -85,17 +85,17 @@ KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name )
     , m_firstFilter(true)
     , m_firstZoom(true)
 {
-    btnZoomIn->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", KIcon::MainToolbar, 16 ));
+    btnZoomIn->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", KIcon::MainToolbar, 16 ));
     connect(btnZoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomIn()));
-    btnZoomOut->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", KIcon::MainToolbar, 16 ));
+    btnZoomOut->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", KIcon::MainToolbar, 16 ));
     connect(btnZoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOut()));
-    btnUpdate->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "reload", KIcon::MainToolbar, 16 ));
+    btnUpdate->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "reload", KIcon::MainToolbar, 16 ));
     connect(btnUpdate, TQT_SIGNAL(clicked()), this, TQT_SLOT(forceUpdate()));
 
     connect(radioBtnPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setPreviewDisplayed(bool)));
 
     connect(checkBoxAutoUpdate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetAutoUpdate(bool)));
-    btnZoomOneToOne->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", KIcon::MainToolbar, 16 ));
+    btnZoomOneToOne->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", KIcon::MainToolbar, 16 ));
     connect(btnZoomOneToOne, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOneToOne()));
 
     m_progress = new KisLabelProgress(frmProgress);
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 26a657c3..cf3542b2 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -868,7 +868,7 @@ void KisView::resizeEvent(TQResizeEvent *)
         }
     }
 
-    int fontheight = TQFontMetrics(KGlobalSettings::generalFont()).height() * 3;
+    int fontheight = TQFontMetrics(TDEGlobalSettings::generalFont()).height() * 3;
     m_vScroll->setPageStep(drawH);
     m_vScroll->setLineStep(fontheight);
     m_hScroll->setPageStep(drawW);