From 59ff04ffaf48f18383b39ea6da17b8e18b6b50c3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:26:42 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/gui/editors/matrix/MatrixView.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/editors/matrix/MatrixView.cpp') 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, -- cgit v1.2.1