diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:21:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:21:05 -0600 |
| commit | a34aeb25a3006e5a708ec955159226e8b197dc27 (patch) | |
| tree | b28fca30332cff7880bce1e4d3f708d4fd212402 /src/pref.cpp | |
| parent | 1366d753b98b2e33452ed46656bff8764e879862 (diff) | |
| download | kmplayer-a34aeb25a3006e5a708ec955159226e8b197dc27.tar.gz kmplayer-a34aeb25a3006e5a708ec955159226e8b197dc27.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/pref.cpp')
| -rw-r--r-- | src/pref.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pref.cpp b/src/pref.cpp index 6440ab1..a274a28 100644 --- a/src/pref.cpp +++ b/src/pref.cpp @@ -71,7 +71,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti TQStringList hierarchy; // typo? :) TQVBoxLayout *vlay; - frame = addPage(i18n("General Options"), TQString(), KGlobal::iconLoader()->loadIcon (TQString ("kmplayer"), KIcon::NoGroup, 32)); + frame = addPage(i18n("General Options"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("kmplayer"), KIcon::NoGroup, 32)); vlay = new TQVBoxLayout(frame, marginHint(), spacingHint()); tab = new TQTabWidget (frame); vlay->addWidget (tab); @@ -84,7 +84,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti tab->insertTab (m_GeneralPageOutput, i18n("Output")); entries.insert (i18n("General Options"), tab); - frame = addPage (i18n ("Source"), TQString(), KGlobal::iconLoader()->loadIcon (TQString ("source"), KIcon::NoGroup, 32)); + frame = addPage (i18n ("Source"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("source"), KIcon::NoGroup, 32)); vlay = new TQVBoxLayout (frame, marginHint(), spacingHint()); tab = new TQTabWidget (frame); vlay->addWidget (tab); @@ -92,7 +92,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti tab->insertTab (m_SourcePageURL, i18n ("URL")); entries.insert (i18n("Source"), tab); - frame = addPage (i18n ("Recording"), TQString(), KGlobal::iconLoader()->loadIcon (TQString ("video"), KIcon::NoGroup, 32)); + frame = addPage (i18n ("Recording"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("video"), KIcon::NoGroup, 32)); vlay = new TQVBoxLayout (frame, marginHint(), spacingHint()); tab = new TQTabWidget (frame); vlay->addWidget (tab); @@ -120,7 +120,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti tab->setCurrentPage (0); entries.insert (i18n("Recording"), tab); - frame = addPage (i18n ("Output Plugins"), TQString(), KGlobal::iconLoader()->loadIcon (TQString ("image"), KIcon::NoGroup, 32)); + frame = addPage (i18n ("Output Plugins"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("image"), KIcon::NoGroup, 32)); vlay = new TQVBoxLayout(frame, marginHint(), spacingHint()); tab = new TQTabWidget (frame); vlay->addWidget (tab); @@ -160,7 +160,7 @@ KDE_NO_EXPORT void Preferences::addPrefPage (PreferencesPage * page) { return; TQMap<TQString, TQTabWidget *>::iterator en_it = entries.find (item); if (en_it == entries.end ()) { - frame = addPage (item, TQString(), KGlobal::iconLoader()->loadIcon ((icon), KIcon::NoGroup, 32)); + frame = addPage (item, TQString(), TDEGlobal::iconLoader()->loadIcon ((icon), KIcon::NoGroup, 32)); vlay = new TQVBoxLayout (frame, marginHint(), spacingHint()); tab = new TQTabWidget (frame); vlay->addWidget (tab); |