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

6 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp
index 9f60479..7edddfc 100644
--- a/src/gui/editors/matrix/MatrixEraser.cpp
+++ b/src/gui/editors/matrix/MatrixEraser.cpp
@@ -47,7 +47,7 @@ MatrixEraser::MatrixEraser(MatrixView* parent)
         : MatrixTool("MatrixEraser", parent),
         m_currentStaff(0)
 {
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
     TQIconSet icon = TQIconSet(pixmap);
 
diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp
index cb604ba..4366ab3 100644
--- a/src/gui/editors/matrix/MatrixMover.cpp
+++ b/src/gui/editors/matrix/MatrixMover.cpp
@@ -60,7 +60,7 @@ MatrixMover::MatrixMover(MatrixView* parent) :
     m_currentStaff(0),
     m_lastPlayedPitch(-1)
 {
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
     TQIconSet icon = TQIconSet(pixmap);
 
diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp
index 04048a7..18a4822 100644
--- a/src/gui/editors/matrix/MatrixPainter.cpp
+++ b/src/gui/editors/matrix/MatrixPainter.cpp
@@ -58,7 +58,7 @@ MatrixPainter::MatrixPainter(MatrixView* parent)
         m_currentElement(0),
         m_currentStaff(0)
 {
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
     TQIconSet icon = TQIconSet(pixmap);
 
diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp
index 253f3c0..2335cd7 100644
--- a/src/gui/editors/matrix/MatrixResizer.cpp
+++ b/src/gui/editors/matrix/MatrixResizer.cpp
@@ -56,7 +56,7 @@ MatrixResizer::MatrixResizer(MatrixView* parent)
         m_currentElement(0),
         m_currentStaff(0)
 {
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     TQCanvasPixmap pixmap(pixmapDir + "/toolbar/select.xpm");
     TQIconSet icon = TQIconSet(pixmap);
 
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index 50a1692..5b3dd26 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -86,7 +86,7 @@ MatrixSelector::MatrixSelector(MatrixView* view)
                 TQT_SLOT(slotMoveSelected()), actionCollection(),
                 "move");
 
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     TQCanvasPixmap pixmap(pixmapDir + "/toolbar/resize.xpm");
     TQIconSet icon = TQIconSet(pixmap);
 
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index a63ca0a..5f69a39 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -166,7 +166,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
 {
     RG_DEBUG << "MatrixView ctor: drumMode " << drumMode << "\n";
 
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/toolbar");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/toolbar");
     TQPixmap matrixPixmap(pixmapDir + "/matrix.xpm");
 
     m_dockLeft = createDockWidget("params dock", matrixPixmap, 0L,
@@ -199,7 +199,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
     if (m_config->readBoolEntry("backgroundtextures-1.6-plus", true)) {
         TQPixmap background;
         TQString pixmapDir =
-            KGlobal::dirs()->findResource("appdata", "pixmaps/");
+            TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
 	// We now use a lined background for the non-percussion matrix,
 	// suggested and supplied by Alessandro Preziosi
 	TQString backgroundPixmap = isDrumMode() ? "bg-paper-white.xpm" : "bg-matrix-lines.xpm";
@@ -635,7 +635,7 @@ void MatrixView::setupActions()
     //
     KRadioAction* toolAction = 0;
 
-    TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+    TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/select.xpm"));
 
     toolAction = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2,