summaryrefslogtreecommitdiffstats
path: root/src/kmplayerconfig.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:21:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:21:05 -0600
commita34aeb25a3006e5a708ec955159226e8b197dc27 (patch)
treeb28fca30332cff7880bce1e4d3f708d4fd212402 /src/kmplayerconfig.cpp
parent1366d753b98b2e33452ed46656bff8764e879862 (diff)
downloadkmplayer-a34aeb25a3006e5a708ec955159226e8b197dc27.tar.gz
kmplayer-a34aeb25a3006e5a708ec955159226e8b197dc27.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/kmplayerconfig.cpp')
-rw-r--r--src/kmplayerconfig.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp
index 64b6bcd..3337585 100644
--- a/src/kmplayerconfig.cpp
+++ b/src/kmplayerconfig.cpp
@@ -89,14 +89,14 @@ KDE_NO_CDTOR_EXPORT Settings::Settings (PartBase * player, KConfig * config)
videodrivers = _vds;
colors [ColorSetting::playlist_background].title = i18n ("Playlist background");
colors [ColorSetting::playlist_background].option = "PlaylistBackground";
- colors [ColorSetting::playlist_background].color = KGlobalSettings::baseColor ();
+ colors [ColorSetting::playlist_background].color = TDEGlobalSettings::baseColor ();
colors [ColorSetting::playlist_foreground].title = i18n ("Playlist foreground");
colors [ColorSetting::playlist_foreground].option = "PlaylistForeground";
- colors [ColorSetting::playlist_foreground].color = KGlobalSettings::textColor();
+ colors [ColorSetting::playlist_foreground].color = TDEGlobalSettings::textColor();
colors [ColorSetting::console_background].title =i18n("Console background");
colors [ColorSetting::playlist_active].title = i18n("Playlist active item");
colors [ColorSetting::playlist_active].option = "PlaylistActive";
- colors [ColorSetting::playlist_active].color = KGlobalSettings::linkColor();
+ colors [ColorSetting::playlist_active].color = TDEGlobalSettings::linkColor();
colors [ColorSetting::console_background].option = "ConsoleBackground";
colors [ColorSetting::console_background].color = TQColor (0, 0, 0);
colors [ColorSetting::console_foreground].title = i18n ("Console foreground");
@@ -110,17 +110,17 @@ KDE_NO_CDTOR_EXPORT Settings::Settings (PartBase * player, KConfig * config)
colors [ColorSetting::area_background].color = TQColor (0, 0, 0);
colors [ColorSetting::infowindow_background].title = i18n ("Info window background");
colors [ColorSetting::infowindow_background].option ="InfoWindowBackground";
- colors [ColorSetting::infowindow_background].color = KGlobalSettings::baseColor ();
+ colors [ColorSetting::infowindow_background].color = TDEGlobalSettings::baseColor ();
colors [ColorSetting::infowindow_foreground].title = i18n ("Info window foreground");
colors [ColorSetting::infowindow_foreground].option ="InfoWindowForeground";
- colors [ColorSetting::infowindow_foreground].color = KGlobalSettings::textColor();
+ colors [ColorSetting::infowindow_foreground].color = TDEGlobalSettings::textColor();
fonts [FontSetting::playlist].title = i18n ("Playlist");
fonts [FontSetting::playlist].option = "PlaylistFont";
- fonts [FontSetting::playlist].font = KGlobalSettings::generalFont();
+ fonts [FontSetting::playlist].font = TDEGlobalSettings::generalFont();
fonts [FontSetting::playlist].font.setItalic (true);
fonts [FontSetting::infowindow].title = i18n ("Info window");
fonts [FontSetting::infowindow].option = "InfoWindowFont";
- fonts [FontSetting::infowindow].font = KGlobalSettings::generalFont();
+ fonts [FontSetting::infowindow].font = TDEGlobalSettings::generalFont();
}
KDE_NO_CDTOR_EXPORT Settings::~Settings () {