diff options
Diffstat (limited to 'src/modules/theme')
| -rw-r--r-- | src/modules/theme/packthemedialog.cpp | 2 | ||||
| -rw-r--r-- | src/modules/theme/savethemedialog.cpp | 2 | ||||
| -rw-r--r-- | src/modules/theme/themefunctions.cpp | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp index de9b2333..d29c6322 100644 --- a/src/modules/theme/packthemedialog.cpp +++ b/src/modules/theme/packthemedialog.cpp @@ -97,7 +97,7 @@ KviPackThemeDialog::KviPackThemeDialog(TQWidget * pParent,KviPointerList<KviThem szPackageVersion = pThemeInfo->version(); m_szPackagePath += pThemeInfo->subdirectory(); - if(m_szPackagePath.tqfind(TQRegExp("[0-9]\\.[0-9]")) == -1) + if(m_szPackagePath.find(TQRegExp("[0-9]\\.[0-9]")) == -1) { m_szPackagePath += "-"; m_szPackagePath += szPackageVersion; diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp index fb7cee03..a38f33e2 100644 --- a/src/modules/theme/savethemedialog.cpp +++ b/src/modules/theme/savethemedialog.cpp @@ -254,7 +254,7 @@ bool KviSaveThemeDialog::saveTheme() if(sto.version().isEmpty())sto.setVersion("1.0.0"); TQString szSubdir = sto.name() + TQString("-") + sto.version(); - szSubdir.tqreplace(TQRegExp("[ \\\\/:][ \\\\/:]*"),"_"); + szSubdir.replace(TQRegExp("[ \\\\/:][ \\\\/:]*"),"_"); sto.setSubdirectory(szSubdir); TQString szAbsDir; diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp index c215d943..280d0192 100644 --- a/src/modules/theme/themefunctions.cpp +++ b/src/modules/theme/themefunctions.cpp @@ -73,21 +73,21 @@ namespace KviThemeFunctions pInfoFields = r.stringInfoFields(); - pValue = pInfoFields->tqfind("PackageType"); + pValue = pInfoFields->find("PackageType"); if(!pValue)return notAValidThemePackage(szError); if(!KviTQString::equalCI(*pValue,"ThemePack"))return notAValidThemePackage(szError); - pValue = pInfoFields->tqfind("ThemePackVersion"); + pValue = pInfoFields->find("ThemePackVersion"); if(!pValue)return notAValidThemePackage(szError); if(!KviTQString::equalCI(*pValue,"1"))return notAValidThemePackage(szError); // make sure the default fields exist for(int i=0;i<6;i++) { - pValue = pInfoFields->tqfind(check_fields[i]); + pValue = pInfoFields->find(check_fields[i]); if(!pValue)return notAValidThemePackage(szError); } - pValue = pInfoFields->tqfind("ThemeCount"); + pValue = pInfoFields->find("ThemeCount"); if(!pValue)return notAValidThemePackage(szError); bool bOk; int iThemeCount = pValue->toInt(&bOk); @@ -97,7 +97,7 @@ namespace KviThemeFunctions // ok.. it should be really valid at this point // load its picture - pByteArray = r.binaryInfoFields()->tqfind("Image"); + pByteArray = r.binaryInfoFields()->find("Image"); if(pByteArray) pix.loadFromData(*pByteArray,0,0); @@ -164,7 +164,7 @@ namespace KviThemeFunctions r.getStringInfoField(szTmp,szThemeThemeEngineVersion); KviTQString::sprintf(szTmp,"Theme%dScreenshot",iIdx); TQPixmap pixScreenshot; - pByteArray = r.binaryInfoFields()->tqfind(szTmp); + pByteArray = r.binaryInfoFields()->find(szTmp); if(pByteArray) pixScreenshot.loadFromData(*pByteArray,0,0); |