aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/theme
diff options
context:
space:
mode:
authorGravatar Elvio Basello2008-05-02 15:39:17 +0000
committerGravatar Elvio Basello2008-05-02 15:39:17 +0000
commit3e4f8a93b0055ef8bb4ec26d828f5feb47fdc1d2 (patch)
tree536cc39d9f86fc77023fe1ae50970d6dd754b86c /src/modules/theme
parentMerged patch by Arfrever Frehtes Taifersar Arahesis (diff)
downloadKVIrc-3e4f8a93b0055ef8bb4ec26d828f5feb47fdc1d2.tar.gz
KVIrc-3e4f8a93b0055ef8bb4ec26d828f5feb47fdc1d2.tar.bz2
KVIrc-3e4f8a93b0055ef8bb4ec26d828f5feb47fdc1d2.zip
code clean on theme
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1654 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/theme')
-rw-r--r--src/modules/theme/libkvitheme.cpp1
-rw-r--r--src/modules/theme/themefunctions.cpp14
-rw-r--r--src/modules/theme/themefunctions.h2
3 files changed, 8 insertions, 9 deletions
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index e73d46be0..fa0553a06 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -30,7 +30,6 @@
#include "kvi_qstring.h"
#include "kvi_parameterlist.h"
#include "kvi_cmdformatter.h"
-#include "kvi_qstring.h"
#include "kvi_error.h"
#include "kvi_out.h"
#include "kvi_iconmanager.h"
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index c70195c1a..d70054835 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -140,7 +140,7 @@ namespace KviThemeFunctions
QString szThemeDate;
QString szThemeSubdirectory;
QString szThemeAuthor;
- QString szThemeThemeEngineVersion;
+ QString szThemeEngineVersion;
QString szThemeApplication;
KviQString::sprintf(szTmp,"Theme%dName",iIdx);
@@ -158,16 +158,16 @@ namespace KviThemeFunctions
KviQString::sprintf(szTmp,"Theme%dAuthor",iIdx);
r.getStringInfoField(szTmp,szThemeAuthor);
KviQString::sprintf(szTmp,"Theme%dThemeEngineVersion",iIdx);
- r.getStringInfoField(szTmp,szThemeThemeEngineVersion);
+ r.getStringInfoField(szTmp,szThemeEngineVersion);
KviQString::sprintf(szTmp,"Theme%dScreenshot",iIdx);
QPixmap pixScreenshot;
pByteArray = r.binaryInfoFields()->find(szTmp);
if(pByteArray)
pixScreenshot.loadFromData(*pByteArray,0,0);
- if(szThemeName.isEmpty() || szThemeVersion.isEmpty() || szThemeSubdirectory.isEmpty() || szThemeThemeEngineVersion.isEmpty())
+ if(szThemeName.isEmpty() || szThemeVersion.isEmpty() || szThemeSubdirectory.isEmpty() || szThemeEngineVersion.isEmpty())
bValid = false;
- if(KviMiscUtils::compareVersions(szThemeThemeEngineVersion,KVI_CURRENT_THEME_ENGINE_VERSION) < 0)
+ if(KviMiscUtils::compareVersions(szThemeEngineVersion,KVI_CURRENT_THEME_ENGINE_VERSION) < 0)
bValid = false;
QString szDetailsBuffer;
@@ -181,7 +181,7 @@ namespace KviThemeFunctions
szThemeApplication,
szThemeAuthor,
szThemeDate,
- szThemeThemeEngineVersion,
+ szThemeEngineVersion,
pixScreenshot,
iIdx
);
@@ -305,7 +305,7 @@ namespace KviThemeFunctions
const QString &szThemeApplication,
const QString &szThemeAuthor,
const QString &szThemeDate,
- const QString &szThemeThemeEngineVersion,
+ const QString &szThemeEngineVersion,
const QPixmap &pixScreenshot,
int iUniqueIndexInDocument
)
@@ -358,7 +358,7 @@ namespace KviThemeFunctions
&szCreatedOn,
&szThemeApplication,
&szThemeEngineVersion,
- &szThemeThemeEngineVersion,
+ &szThemeEngineVersion,
&szSubdirectory,
&szThemeSubdirectory
);
diff --git a/src/modules/theme/themefunctions.h b/src/modules/theme/themefunctions.h
index e35e0c82d..3849ec9dc 100644
--- a/src/modules/theme/themefunctions.h
+++ b/src/modules/theme/themefunctions.h
@@ -42,7 +42,7 @@ namespace KviThemeFunctions
const QString &szThemeApplication,
const QString &szThemeAuthor,
const QString &szThemeDate,
- const QString &szThemeThemeEngineVersion,
+ const QString &szThemeEngineVersion,
const QPixmap &pixScreenshot,
int iUniqueIndexInDocument = 0
);