summaryrefslogtreecommitdiffstats
path: root/quanta/components
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:51:30 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:51:30 -0600
commit29df04c24350cc76a41e2410d1c92445f9338b98 (patch)
treec2b9cde128e24275393a83d9eaec58b2ef12d109 /quanta/components
parentc70534eef6085384ef7ddff369a154dbc8901917 (diff)
downloadtdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.tar.gz
tdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'quanta/components')
-rw-r--r--quanta/components/csseditor/encodingselector.cpp4
-rw-r--r--quanta/components/csseditor/fontfamilychooser.cpp2
2 files changed, 3 insertions, 3 deletions
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;