This commit is contained in:
Vadim Kurland
2009-12-10 22:30:04 +00:00
parent 269476612e
commit af640aa600
2 changed files with 7 additions and 30 deletions
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 2087 #define BUILD_NUM 2089
+6 -29
View File
@@ -51,12 +51,6 @@
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QtDebug> #include <QtDebug>
/*
#ifdef _WIN32
# include <windows.h>
#endif
*/
#include "FWBSettings.h" #include "FWBSettings.h"
#include "RCS.h" #include "RCS.h"
#include "FWWindow.h" #include "FWWindow.h"
@@ -101,29 +95,21 @@
#include <util.h> #include <util.h>
#endif #endif
//#ifdef Q_OS_MACX
//# include <util.h>
//#endif
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "../common/init.cpp" #include "../common/init.cpp"
#ifdef ELC
extern int init2(const QString &a1,
const QString &moduleName,
const QString &rp1,
const QString &rp2,
const QString &rp3,
bool f1, bool f2, bool d);
#endif
#if defined(Q_WS_MAC) #if defined(Q_WS_MAC)
extern void connectOdocHandler(); extern void connectOdocHandler();
#endif #endif
#ifndef INIT2
#define INIT2
#endif
extern void extras();
using namespace libfwbuilder; using namespace libfwbuilder;
using namespace std; using namespace std;
@@ -607,16 +593,7 @@ int main( int argc, char *argv[] )
QPixmapCache::setCacheLimit(4096); QPixmapCache::setCacheLimit(4096);
// app->setFont(st->getTreeFont()); INIT2;
#ifdef ELC
init2(argv0.c_str(),
"Firewall Builder",
"fwb_gui30",
FWBSettings::getApplicationNameForSettings(),
"3.1",
true, true, fwbdebug);
#endif
string full_res_path = respath + FS_SEPARATOR + "resources.xml"; string full_res_path = respath + FS_SEPARATOR + "resources.xml";