From 29df04c24350cc76a41e2410d1c92445f9338b98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- quanta/components/csseditor/encodingselector.cpp | 4 ++-- quanta/components/csseditor/fontfamilychooser.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'quanta/components/csseditor') diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp index f8ba4ac6..ad5b958b 100644 --- a/quanta/components/csseditor/encodingselector.cpp +++ b/quanta/components/csseditor/encodingselector.cpp @@ -27,11 +27,11 @@ */ encodingSelector::encodingSelector(TQWidget *parent, const char* name) : encodingSelectorS(parent,name){ - TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); + TQStringList encodings (TDEGlobal::charsets()->availableEncodingNames()); int insert = 0; for (uint i=0; i < encodings.count(); i++) { bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(encodings[i], found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(encodings[i], found); if (found){ cbEncoding->insertItem (encodings[i]); diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index bd9e59ef..6a390340 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -34,7 +34,7 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontFamilyChooserS(parent,name){ - TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black ); + TQFont tmpFont( TDEGlobalSettings::generalFont().family(), 64, TQFont::Black ); lePreview->setMinimumHeight( lePreview->fontMetrics().lineSpacing() ); lePreview->setAlignment(TQt::AlignCenter); TQFont font; -- cgit v1.2.1