aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2015-09-15 04:08:12 +0200
committerGravatar Szymon Tomasz Stefanek2015-09-15 04:08:12 +0200
commitcba7efb48e9c6ba50e1585a475fe4cb0d0046f35 (patch)
treeda48ad27d84cb2a6d50fdd2dc37bf1e7cc06fac6
parentAdd package management module (2) (diff)
downloadKVIrc-cba7efb48e9c6ba50e1585a475fe4cb0d0046f35.tar.gz
KVIrc-cba7efb48e9c6ba50e1585a475fe4cb0d0046f35.tar.bz2
KVIrc-cba7efb48e9c6ba50e1585a475fe4cb0d0046f35.zip
Improve package management
-rw-r--r--src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp12
-rw-r--r--src/modules/addon/AddonFunctions.cpp2
-rw-r--r--src/modules/theme/SaveThemeDialog.cpp4
-rw-r--r--src/modules/theme/ThemeFunctions.cpp2
4 files changed, 9 insertions, 11 deletions
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
index 6fee9311a..1b32ae1b1 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
@@ -696,18 +696,18 @@ namespace KviKvsCoreSimpleCommands
@title:
debug
@syntax:
- debug [-s] [-c] <text>
+ debug [-s] [-c] <text:string>
@short:
Outputs text to the debug window
@switches:
!sw: -s | --system-console
Output to the system console instead of the debug window.
- !sw: -c | --scriptcontext-name
- Prepend the script's context name to the output.
+ !sw: -c | --scriptcontext-name
+ Prepend the script's context name to the output.
@description:
If the -s switch is not specified then outputs the &lt;text&gt; to the debug window.
If the -s switch is used then the output is sent to the system console instead.
- If the -c switch is used then the script's context name will be prepended to the output.
+ If the -c switch is used then the script's context name will be prepended to the output.
This is useful if you need to debug destructors of objects
or events that are triggered at kvirc shutdown.
@seealso:
@@ -719,8 +719,8 @@ namespace KviKvsCoreSimpleCommands
QString szAll;
KVSCSC_pParams->allAsString(szAll);
- if(KVSCSC_pSwitches->find('c',"scriptcontext-name"))
- szAll.prepend(__pContext->script()->name()+": ");
+ if(KVSCSC_pSwitches->find('c',"scriptcontext-name"))
+ szAll.prepend(__pContext->script()->name()+": ");
if(KVSCSC_pSwitches->find('s',"system-console"))
qDebug("%s",szAll.toUtf8().data());
else {
diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp
index 008506684..cf5d2577f 100644
--- a/src/modules/addon/AddonFunctions.cpp
+++ b/src/modules/addon/AddonFunctions.cpp
@@ -300,7 +300,7 @@ namespace AddonFunctions
info.szMinVersion = KVI_VERSION;
QString szTmp;
- szTmp = QDateTime::currentDateTime().toString();
+ szTmp = QDateTime::currentDateTime().toString(Qt::ISODate);
KviPackageWriter pw;
pw.addInfoField("PackageType","AddonPack");
diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp
index 09e748510..9a1bb93b3 100644
--- a/src/modules/theme/SaveThemeDialog.cpp
+++ b/src/modules/theme/SaveThemeDialog.cpp
@@ -262,9 +262,7 @@ bool SaveThemeDialog::saveTheme()
sto.setAuthor(m_pAuthorNameEdit->text());
sto.setDescription(m_pThemeDescriptionEdit->toPlainText());
- // this is the equivalent to an empty date.toString() call, but it's needed
- // to ensure qt4 will use the default() locale and not the system() one
- sto.setDate(QLocale().toString(QDateTime::currentDateTime(), "ddd MMM d hh:mm:ss yyyy"));
+ sto.setDate(QDateTime::currentDateTime().toString(Qt::ISODate));
sto.setVersion(m_pThemeVersionEdit->text());
sto.setApplication("KVIrc " KVI_VERSION "." KVI_SOURCES_DATE);
diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp
index 86a0aa8d8..fe47cce02 100644
--- a/src/modules/theme/ThemeFunctions.cpp
+++ b/src/modules/theme/ThemeFunctions.cpp
@@ -433,7 +433,7 @@ namespace ThemeFunctions
f.addInfoField("Description",szPackageDescription);
// this is the equivalent to an empty date.toString() call, but it's needed
// to ensure qt4 will use the default() locale and not the system() one
- f.addInfoField("Date",QLocale().toString(QDateTime::currentDateTime(),"ddd MMM d hh:mm:ss yyyy"));
+ f.addInfoField("Date",QDateTime::currentDateTime().toString(Qt::ISODate));
f.addInfoField("Application","KVIrc " KVI_VERSION "." KVI_SOURCES_DATE);
if(!out.isNull())