diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:42 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:42 -0600 |
commit | 59ff04ffaf48f18383b39ea6da17b8e18b6b50c3 (patch) | |
tree | 3c5878d4255116c6146b38687214acf355eb7564 /src/gui/dialogs/ConfigureDialog.cpp | |
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/dialogs/ConfigureDialog.cpp')
-rw-r--r-- | src/gui/dialogs/ConfigureDialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp index db00fdc..cbb3b56 100644 --- a/src/gui/dialogs/ConfigureDialog.cpp +++ b/src/gui/dialogs/ConfigureDialog.cpp @@ -45,7 +45,7 @@ namespace Rosegarden static TQPixmap loadIcon(const char *name) { - TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/"); TQString fileBase = pixmapDir + "/misc/"; fileBase += name; if (TQFile(fileBase + ".png").exists()) { @@ -53,7 +53,7 @@ static TQPixmap loadIcon(const char *name) } else if (TQFile(fileBase + ".xpm").exists()) { return TQPixmap(fileBase + ".xpm"); } - TQPixmap pmap = KGlobal::instance()->iconLoader() + TQPixmap pmap = TDEGlobal::instance()->iconLoader() ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium); return pmap; } |