From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/css/cssconfig.ui | 24 ++++++++++---------- kcontrol/css/csscustom.ui | 58 +++++++++++++++++++++++------------------------ kcontrol/css/kcmcss.cpp | 4 ++-- kcontrol/css/preview.ui | 8 +++---- kcontrol/css/template.cpp | 6 ++--- 5 files changed, 50 insertions(+), 50 deletions(-) (limited to 'kcontrol/css') diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui index c3d064b48..619cf7d0c 100644 --- a/kcontrol/css/cssconfig.ui +++ b/kcontrol/css/cssconfig.ui @@ -1,6 +1,6 @@ CSSConfigDialog - + CSSConfigDialog @@ -29,7 +29,7 @@ 0 - + ButtonGroup1 @@ -60,7 +60,7 @@ 6 - + useDefault @@ -74,7 +74,7 @@ <b>Use default stylesheet</b><p>Select this option to use the default stylesheet.</p> - + useUser @@ -85,7 +85,7 @@ <b>Use user-defined stylesheet</b><p>If this box is checked, Konqueror will try to load a user-defined style sheet as specified in the location below. The style sheet allows you to completely override the way web pages are rendered in your browser. The file specified should contain a valid style sheet (see http://www.w3.org/Style/CSS for further information on cascading style sheets).</p> - + layout3 @@ -103,7 +103,7 @@ Fixed - + 16 20 @@ -120,7 +120,7 @@ - + useAccess @@ -139,7 +139,7 @@ <b>Use accessibility stylesheet</b><p>Selecting this option will allow you to define a default font, font size, and font color with a few simple clicks of the mouse. Simply wander over to the Customize... dialog and pick out your desired options.</p> - + layout2 @@ -157,14 +157,14 @@ Fixed - + 16 20 - + customize @@ -185,7 +185,7 @@ Expanding - + 451 20 @@ -206,7 +206,7 @@ Expanding - + 20 50 diff --git a/kcontrol/css/csscustom.ui b/kcontrol/css/csscustom.ui index b19e08baf..5422f614d 100644 --- a/kcontrol/css/csscustom.ui +++ b/kcontrol/css/csscustom.ui @@ -1,6 +1,6 @@ CSSCustomDialog - + CSSCustomDialog @@ -19,7 +19,7 @@ unnamed - + GroupBox3 @@ -38,7 +38,7 @@ unnamed - + 7 @@ -119,7 +119,7 @@ true - + txtFontsize @@ -130,7 +130,7 @@ basefontsize - + dontScale @@ -151,7 +151,7 @@ - + GroupBox3_2 @@ -165,7 +165,7 @@ unnamed - + hideImages @@ -176,7 +176,7 @@ <b>Suppress images</b><p>Selecting this will prevent Konqueror from loading images.</p> - + hideBackground @@ -192,7 +192,7 @@ - + GroupBox7 @@ -206,7 +206,7 @@ unnamed - + txtBaseFontFamily @@ -217,7 +217,7 @@ fontFamily - + fontFamily @@ -243,14 +243,14 @@ Expanding - + 0 20 - + sameFamily @@ -273,14 +273,14 @@ Expanding - + 20 0 - + Layout1 @@ -294,7 +294,7 @@ 6 - + preview @@ -315,7 +315,7 @@ Expanding - + 0 20 @@ -324,7 +324,7 @@ - + ButtonGroup2 @@ -341,7 +341,7 @@ unnamed - + blackOnWhite @@ -355,7 +355,7 @@ <b>Black on White</b><p>This is what you normally see.</p> - + whiteOnBlack @@ -366,7 +366,7 @@ <b>White on Black</b><p>This is your classic inverse color scheme.</p> - + customColor @@ -377,7 +377,7 @@ <b>Custom</b><p>Select this option to define a custom color for the default font.</p> - + Layout2 @@ -412,7 +412,7 @@ Expanding - + 0 20 @@ -429,7 +429,7 @@ Fixed - + 21 20 @@ -446,7 +446,7 @@ Fixed - + 20 20 @@ -463,14 +463,14 @@ Expanding - + 0 20 - + txtForeground @@ -495,7 +495,7 @@ <b>Background</b><p>Behind this door lays the ability to choose a custom default background.</p> - + txtBackground @@ -511,7 +511,7 @@ - + sameColor diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index 552afd3a3..9706ccd5f 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -133,8 +133,8 @@ void CSSConfig::load( bool useDefaults ) customDialog->blackOnWhite->setChecked(m == "black-on-white"); customDialog->whiteOnBlack->setChecked(m == "white-on-black"); customDialog->customColor->setChecked(m == "custom"); - customDialog->backgroundColor->setColor(c->readColorEntry("BackColor", &Qt::white)); - customDialog->foregroundColor->setColor(c->readColorEntry("ForeColor", &Qt::black)); + customDialog->backgroundColor->setColor(c->readColorEntry("BackColor", &TQt::white)); + customDialog->foregroundColor->setColor(c->readColorEntry("ForeColor", &TQt::black)); customDialog->sameColor->setChecked(c->readBoolEntry("SameColor", false)); // Images diff --git a/kcontrol/css/preview.ui b/kcontrol/css/preview.ui index 438d40d37..a58946576 100644 --- a/kcontrol/css/preview.ui +++ b/kcontrol/css/preview.ui @@ -1,6 +1,6 @@ PreviewDialog - + PreviewDialog @@ -37,14 +37,14 @@ Expanding - + 20 20 - + preview @@ -62,7 +62,7 @@ people.</p> </qt> - + PushButton2 diff --git a/kcontrol/css/template.cpp b/kcontrol/css/template.cpp index e237ed796..a34839ef2 100644 --- a/kcontrol/css/template.cpp +++ b/kcontrol/css/template.cpp @@ -23,16 +23,16 @@ bool CSSTemplate::expand(TQString destname, const TQMap &dict { line = is.readLine(); - int start = line.find('$'); + int start = line.tqfind('$'); if (start >= 0) { - int end = line.find('$', start+1); + int end = line.tqfind('$', start+1); if (end >= 0) { TQString expr = line.mid(start+1, end-start-1); TQString res = dict[expr]; - line.replace(start, end-start+1, res); + line.tqreplace(start, end-start+1, res); } } os << line << endl; -- cgit v1.2.3