diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:26:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:26:42 -0600 |
| commit | 59ff04ffaf48f18383b39ea6da17b8e18b6b50c3 (patch) | |
| tree | 3c5878d4255116c6146b38687214acf355eb7564 /src/gui/general | |
| parent | c329cc4e7edb85184878ba8238c4344cbaba2ac0 (diff) | |
| download | rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.tar.gz rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/general')
| -rw-r--r-- | src/gui/general/EditView.cpp | 4 | ||||
| -rw-r--r-- | src/gui/general/EditViewBase.cpp | 2 | ||||
| -rw-r--r-- | src/gui/general/PresetGroup.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
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(), diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp index 6f5cbfe..0795b5f 100644 --- a/src/gui/general/EditViewBase.cpp +++ b/src/gui/general/EditViewBase.cpp @@ -199,7 +199,7 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard) actionCollection(), KStdAction::stdName(KStdAction::Redo)); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png"); TQIconSet icon = TQIconSet(pixmap); diff --git a/src/gui/general/PresetGroup.cpp b/src/gui/general/PresetGroup.cpp index 2c39256..9eb17ba 100644 --- a/src/gui/general/PresetGroup.cpp +++ b/src/gui/general/PresetGroup.cpp @@ -65,9 +65,9 @@ PresetGroup::PresetGroup() : m_amateur(false), m_pro(false) { - m_presetDirectory = KGlobal::dirs()->findResource("appdata", "presets/"); + m_presetDirectory = TDEGlobal::dirs()->findResource("appdata", "presets/"); - TQString language = KGlobal::locale()->language(); + TQString language = TDEGlobal::locale()->language(); TQString presetFileName = TQString("%1/presets-%2.xml") .arg(m_presetDirectory).arg(language); |