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

5 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 20fb211..0f25aeb 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -387,7 +387,7 @@ MarkerEditor::setupActions()
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Redo));
 
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     kapp->config()->setGroup(MarkerEditorConfigGroup);
     int timeMode = kapp->config()->readNumEntry("timemode", 0);
 
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index 95d9cfc..90dae37 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -229,7 +229,7 @@ void PlayList::save()
         item = dynamic_cast<PlayListViewItem*>(item->nextSibling());
     }
 
-    KConfig *kc = KGlobal::config();
+    KConfig *kc = TDEGlobal::config();
     KConfigGroupSaver cs(kc, PlayListConfigGroup);
     kc->writeEntry("Playlist Files", urlList);
 
@@ -238,7 +238,7 @@ void PlayList::save()
 
 void PlayList::restore()
 {
-    KConfig *kc = KGlobal::config();
+    KConfig *kc = TDEGlobal::config();
     getListView()->restoreLayout(kc, PlayListConfigGroup);
 
     KConfigGroupSaver cs(kc, PlayListConfigGroup);
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index 2d5a66d..e4eb458 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -644,7 +644,7 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
     if (!havePixmaps) {
 
         TQString pixmapDir =
-            KGlobal::dirs()->findResource("appdata", "pixmaps/");
+            TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
 
         connectedPixmap.load
             (TQString("%1/misc/connected.xpm").arg(pixmapDir));
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 9eeb21b..cb8db68 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -174,7 +174,7 @@ TrackEditor::init(TQWidget* rosegardenguiview)
     kapp->config()->setGroup(GeneralOptionsConfigGroup);
     if (kapp->config()->readBoolEntry("backgroundtextures", true)) {
         TQPixmap background;
-        TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+        TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
         if (background.load(TQString("%1/misc/bg-segmentcanvas.xpm").
                             arg(pixmapDir))) {
             m_segmentCanvas->setBackgroundPixmap(background);
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index 62fd06b..60dde0c 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -382,7 +382,7 @@ TriggerSegmentManager::setupActions()
     m_closeButton->setText(close->text());
     connect(m_closeButton, TQT_SIGNAL(released()), TQT_TQOBJECT(this), TQT_SLOT(slotClose()));
 
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
 
     // some adjustments
     new KToolBarPopupAction(i18n("Und&o"),