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/general/EditView.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/general/EditView.cpp') diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp index 42655f8..c8e36eb 100644 --- a/src/gui/general/EditView.cpp +++ b/src/gui/general/EditView.cpp @@ -360,7 +360,7 @@ void EditView::addPropertyBox(TQWidget *w) void EditView::addControlRuler(ControlRuler* ruler) { ruler->setWorldMatrix(m_currentRulerZoomMatrix); - m_controlRulers->addTab(ruler, KGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Small), + m_controlRulers->addTab(ruler, TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Small), ruler->getName()); m_controlRulers->showPage(ruler); @@ -723,7 +723,7 @@ EditView::setupActions() // // Tempo and time signature changes // - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-tempo.png"); TQIconSet icon = TQIconSet(pixmap); new KAction(AddTempoChangeCommand::getGlobalName(), -- cgit v1.2.1