summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:26:42 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:26:42 -0600
commit59ff04ffaf48f18383b39ea6da17b8e18b6b50c3 (patch)
tree3c5878d4255116c6146b38687214acf355eb7564 /src/gui/widgets
parentc329cc4e7edb85184878ba8238c4344cbaba2ac0 (diff)
downloadrosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.tar.gz
rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/AudioFaderBox.cpp2
-rw-r--r--src/gui/widgets/CollapsingFrame.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/AudioFaderBox.cpp b/src/gui/widgets/AudioFaderBox.cpp
index 7410c88..3313a79 100644
--- a/src/gui/widgets/AudioFaderBox.cpp
+++ b/src/gui/widgets/AudioFaderBox.cpp
@@ -115,7 +115,7 @@ AudioFaderBox::AudioFaderBox(TQWidget *parent,
m_fader->setOutlineColour(GUIPalette::getColour(GUIPalette::PlaybackFaderOutline));
- TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+ TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir));
m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir));
diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index 7889a78..3d350dd 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -60,7 +60,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
font.setBold(true);
m_toggleButton->setFont(font);
- TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+ TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQPixmap pixmap(pixmapDir + "/misc/arrow-expanded.png");
m_toggleButton->setIconSet(pixmap);
@@ -122,7 +122,7 @@ CollapsingFrame::toggle()
m_widget->setShown(!m_collapsed);
- TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+ TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
TQPixmap pixmap;
if (m_collapsed) {