From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/kthememanager/knewthemedlg.h | 2 +- kcontrol/kthememanager/ktheme.cpp | 16 +++++++------- kcontrol/kthememanager/kthemedlg.ui | 38 ++++++++++++++++---------------- kcontrol/kthememanager/kthememanager.cpp | 2 +- kcontrol/kthememanager/newthemewidget.ui | 6 ++--- 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'kcontrol/kthememanager') diff --git a/kcontrol/kthememanager/knewthemedlg.h b/kcontrol/kthememanager/knewthemedlg.h index 5a0df045a..8ea226d8b 100644 --- a/kcontrol/kthememanager/knewthemedlg.h +++ b/kcontrol/kthememanager/knewthemedlg.h @@ -26,7 +26,7 @@ class NewThemeWidget; /** - * Dialog for creating new themes, contains just + * Dialog for creating new themes, tqcontains just * getters and setters used for the theme general properties * @author Lukas Tinkl */ diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index b78a354be..f2d0395ed 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -469,14 +469,14 @@ void KTheme::apply() iconConf->setGroup( "ToolbarIcons" ); TQString iconName = iconSubElem.tagName(); - if ( iconName.contains( "Color" ) ) + if ( iconName.tqcontains( "Color" ) ) { TQColor iconColor = TQColor( iconSubElem.attribute( "rgb" ) ); iconConf->writeEntry( iconName, iconColor, true, true ); } - else if ( iconName.contains( "Value" ) || iconName == "Size" ) + else if ( iconName.tqcontains( "Value" ) || iconName == "Size" ) iconConf->writeEntry( iconName, iconSubElem.attribute( "value" ).toUInt(), true, true ); - else if ( iconName.contains( "Effect" ) ) + else if ( iconName.tqcontains( "Effect" ) ) iconConf->writeEntry( iconName, iconSubElem.attribute( "name" ), true, true ); else iconConf->writeEntry( iconName, static_cast( iconSubElem.attribute( "value" ).toUInt() ), true, true ); @@ -738,18 +738,18 @@ void KTheme::createIconElems( const TQString & group, const TQString & object, << "DisabledColor" << "DisabledColor2" << "DisabledEffect" << "DisabledSemiTransparent" << "DisabledValue"; for ( TQStringList::ConstIterator it = elemNames.begin(); it != elemNames.end(); ++it ) { - if ( (*it).contains( "Color" ) ) + if ( (*it).tqcontains( "Color" ) ) createColorElem( *it, object, parent, cfg ); else { TQDomElement tmpCol = m_dom.createElement( *it ); tmpCol.setAttribute( "object", object ); - if ( (*it).contains( "Value" ) || *it == "Size" ) + if ( (*it).tqcontains( "Value" ) || *it == "Size" ) tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) ); - else if ( (*it).contains( "DisabledEffect" ) ) + else if ( (*it).tqcontains( "DisabledEffect" ) ) tmpCol.setAttribute( "name", cfg->readEntry( *it, "togray" ) ); - else if ( (*it).contains( "Effect" ) ) + else if ( (*it).tqcontains( "Effect" ) ) tmpCol.setAttribute( "name", cfg->readEntry( *it, "none" ) ); else tmpCol.setAttribute( "value", cfg->readBoolEntry( *it, false ) ); @@ -832,7 +832,7 @@ TQString KTheme::processFilePath( const TQString & section, const TQString & pat TQString KTheme::unprocessFilePath( const TQString & section, TQString path ) { if ( path.startsWith( "theme:/" ) ) - return path.replace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); + return path.tqreplace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); if ( TQFile::exists( path ) ) return path; diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui index 4b46fdc26..361ca5129 100644 --- a/kcontrol/kthememanager/kthemedlg.ui +++ b/kcontrol/kthememanager/kthemedlg.ui @@ -5,7 +5,7 @@ KThemeDlg - + 0 0 @@ -30,7 +30,7 @@ - layout2 + tqlayout2 @@ -60,7 +60,7 @@ MinimumExpanding - + 170 20 @@ -88,7 +88,7 @@ - layout1 + tqlayout1 @@ -109,7 +109,7 @@ Box - + AlignCenter @@ -193,7 +193,7 @@ - layout4 + tqlayout4 @@ -211,13 +211,13 @@ 0 - + 80 60 - + 32767 60 @@ -251,13 +251,13 @@ 0 - + 80 60 - + 32767 60 @@ -291,13 +291,13 @@ 0 - + 80 60 - + 32767 60 @@ -331,13 +331,13 @@ 0 - + 80 60 - + 32767 60 @@ -371,13 +371,13 @@ 0 - + 80 60 - + 32767 60 @@ -411,13 +411,13 @@ 0 - + 80 60 - + 32767 60 @@ -511,7 +511,7 @@ startFonts() startSaver() - + kurllabel.h diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 2668bd87c..e64642109 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -298,7 +298,7 @@ void kthememanager::slotCreateTheme() m_theme->setAuthor( dlg.getAuthor() ); m_theme->setEmail( dlg.getEmail() ); m_theme->setHomepage( dlg.getHomepage() ); - m_theme->setComment( dlg.getComment().replace( "\n", "" ) ); + m_theme->setComment( dlg.getComment().tqreplace( "\n", "" ) ); m_theme->setVersion( dlg.getVersion() ); TQString result = m_theme->createYourself( true ); diff --git a/kcontrol/kthememanager/newthemewidget.ui b/kcontrol/kthememanager/newthemewidget.ui index 905b0749a..ae9ef90d0 100644 --- a/kcontrol/kthememanager/newthemewidget.ui +++ b/kcontrol/kthememanager/newthemewidget.ui @@ -5,7 +5,7 @@ NewThemeWidget - + 0 0 @@ -88,7 +88,7 @@ Co&mment: - + AlignTop @@ -126,5 +126,5 @@ leVersion teComment - + -- cgit v1.2.1