summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:08 -0600
commit337312fb5f3579291dd3ae458b3628ea20d740fa (patch)
tree26109c47a9b354b94446b572aefe58ae80a86339
parent7b4cf8fc7ba6f71c9d46fe37af157933ab2af9c7 (diff)
downloadgtk3-tqt-engine-337312fb5f3579291dd3ae458b3628ea20d740fa.tar.gz
gtk3-tqt-engine-337312fb5f3579291dd3ae458b3628ea20d740fa.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
-rw-r--r--tdegtk/tdegtk-theme.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tdegtk/tdegtk-theme.cpp b/tdegtk/tdegtk-theme.cpp
index 98c3c12..cb0cb6f 100644
--- a/tdegtk/tdegtk-theme.cpp
+++ b/tdegtk/tdegtk-theme.cpp
@@ -1014,11 +1014,11 @@ void writeGtkThemeControlFile(int forceRecreate) {
// stream << parse_rc_string("padding: " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_)), "GtkMenu>GtkSeparatorMenuItem");
// Set up fonts
- TQFont generalFont = KGlobalSettings::generalFont();
- TQFont toolBarFont = KGlobalSettings::toolBarFont();
- TQFont menuFont = KGlobalSettings::menuFont();
- // TQFont windowTitleFont = KGlobalSettings::windowTitleFont();
- // TQFont taskbarFont = KGlobalSettings::taskbarFont();
+ TQFont generalFont = TDEGlobalSettings::generalFont();
+ TQFont toolBarFont = TDEGlobalSettings::toolBarFont();
+ TQFont menuFont = TDEGlobalSettings::menuFont();
+ // TQFont windowTitleFont = TDEGlobalSettings::windowTitleFont();
+ // TQFont taskbarFont = TDEGlobalSettings::taskbarFont();
stream << parse_rc_string(tdeFontToGTKFontString(generalFont), "*");
stream << parse_rc_string(tdeFontToGTKFontString(toolBarFont), "*GtkToolbar*GtkButton*");