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/rulers | |
| 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/rulers')
| -rw-r--r-- | src/gui/rulers/MarkerRuler.cpp | 2 | ||||
| -rw-r--r-- | src/gui/rulers/TempoRuler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp index 6d385b5..f2c76a6 100644 --- a/src/gui/rulers/MarkerRuler.cpp +++ b/src/gui/rulers/MarkerRuler.cpp @@ -89,7 +89,7 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc, m_barFont = new TQFont(); m_barFont->setPointSize(10); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon; // Use the event insert, delete, edit icons because they are diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp index 30d6108..9a16467 100644 --- a/src/gui/rulers/TempoRuler.cpp +++ b/src/gui/rulers/TempoRuler.cpp @@ -120,7 +120,7 @@ TempoRuler::TempoRuler(RulerScale *rulerScale, (doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(update())); - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon; icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png")); |