diff options
| author |  Fabio Bas | 2012-02-27 18:59:08 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-02-27 18:59:08 +0000 |
| commit | 5f2b44d87a16c6e89656d610257d6e034c31774e (patch) | |
| tree | 2383087580b59078a0e2bee88e4fe976c1a91131 /src | |
| parent | fix or the previous fix, sorry guys (diff) | |
| download | KVIrc-5f2b44d87a16c6e89656d610257d6e034c31774e.tar.gz KVIrc-5f2b44d87a16c6e89656d610257d6e034c31774e.tar.bz2 KVIrc-5f2b44d87a16c6e89656d610257d6e034c31774e.zip | |
probable fix for msvc compilation
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6082 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kernel/KviCoreActions.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp index 97d647f97..4d87e7eb7 100644 --- a/src/kvirc/kernel/KviCoreActions.cpp +++ b/src/kvirc/kernel/KviCoreActions.cpp @@ -166,25 +166,29 @@ void register_core_actions(KviActionManager * m) KviAction::NeedsContext, QString()); +#ifdef COMPILE_ON_MAC SCRIPT_ACTION( KVI_COREACTION_GENERALOPTIONS, "options.dialog -t", -#ifdef COMPILE_ON_MAC "Configure KVIrc...", -#else - __tr2qs("Configure KVIrc..."), -#endif __tr2qs("Shows the general options dialog"), KviActionManager::categorySettings(), "kvi_bigicon_settings.png", -#ifdef COMPILE_ON_MAC -1, -#else - KviIconManager::Options, -#endif 0, KVI_SHORTCUTS_OPTIONS); - +#else + SCRIPT_ACTION( + KVI_COREACTION_GENERALOPTIONS, + "options.dialog -t", + __tr2qs("Configure KVIrc..."), + __tr2qs("Shows the general options dialog"), + KviActionManager::categorySettings(), + "kvi_bigicon_settings.png", + KviIconManager::Options, + 0, + KVI_SHORTCUTS_OPTIONS); +#endif SCRIPT_ACTION( KVI_COREACTION_THEMEOPTIONS, "options.dialog -t theme", |