From 337312fb5f3579291dd3ae458b3628ea20d740fa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:19:08 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tdegtk/tdegtk-theme.cpp | 10 +++++----- 1 file 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*"); -- cgit v1.2.1