re-enabled styledcontrols on mingw

fixed segfault on setup

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1889 17fca916-40b9-46aa-a4ea-0a15b648b75c

4 files changed, 16 insertions, 31 deletions

diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index 68d31a28b..c10fe380d 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -53,6 +53,7 @@ SET(kvirc_MOC_HDRS
 	ui/kvi_splash.h
 	ui/kvi_statusbar.h
 	ui/kvi_statusbarapplet.h

+        ui/kvi_styled_controls.h
 	ui/kvi_taskbar.h
 	ui/kvi_texticonwin.h
 	ui/kvi_themedlabel.h
@@ -212,10 +213,6 @@ SET(kvirc_MOC_HDRS
 	kernel/kvi_useraction.h
 	kernel/kvi_userinput.h
 )
-

-IF(NOT MINGW)

-        LIST(APPEND kvirc_MOC_HDRS ui/kvi_styled_controls.h)

-ENDIF()

 
 SET(kvirc_SRCS
 	ui/kvi_actiondrawer.cpp
@@ -441,18 +438,16 @@ ELSE()
 ENDIF()
 
 ADD_EXECUTABLE(${KVIRC_BINARYNAME} ${kvirc_SRCS} ${kvirc_MOC_SRCS})
-

-#we need this defined when mingw will compile moc files

-IF(MINGW)

-        ADD_DEFINITIONS(-D__KVIRC__)

-ENDIF()

 
 # Link libraries
 TARGET_LINK_LIBRARIES(${KVIRC_BINARYNAME} ${KVILIB_BINARYNAME} ${LIBS})
-

-IF(MINGW)

-        SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import,--enable-runtime-pseudo-reloc" ENABLE_EXPORTS ON)

-ENDIF()

+
+IF(MINGW)
+        # needed for linking
+        SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import,--enable-runtime-pseudo-reloc" ENABLE_EXPORTS ON)
+        #we need this defined when mingw will compile moc files
+        ADD_DEFINITIONS(-D__KVIRC__)
+ENDIF()
 
 # Installation directives
 IF(UNIX)
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 12256d609..e8bb0d2c0 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -213,6 +213,8 @@ void KviApp::setup()
 #ifdef COMPILE_SSL_SUPPORT
 	KviSSL::globalInit();
 #endif
+

+      	g_pIconManager = new KviIconManager();

 
 	// Setup our filesystem and initalize locale
 	loadDirectories();
@@ -277,13 +279,12 @@ void KviApp::setup()
 	KVI_SPLASH_SET_PROGRESS(3)
 
 	// Create the module manager early: so the other managers can load modules
-	g_pModuleExtensionManager = new KviModuleExtensionManager();
-	g_pModuleManager = new KviModuleManager();
-
-	KVI_SPLASH_SET_PROGRESS(4);
-
-	g_pIconManager = new KviIconManager();
+	g_pModuleExtensionManager = new KviModuleExtensionManager();

+        

+      	KVI_SPLASH_SET_PROGRESS(4);
 
+	g_pModuleManager = new KviModuleManager();
+

 	KVI_SPLASH_SET_PROGRESS(5)
 
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_USERACTIONS))
diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp
index 199913a81..d57ddcbb2 100644
--- a/src/kvirc/ui/kvi_styled_controls.cpp
+++ b/src/kvirc/ui/kvi_styled_controls.cpp
@@ -37,8 +37,6 @@
 #include <QTimer>
 #include <QPaintEvent>
 
-#ifndef COMPILE_ON_MINGW
-
 KviStyledControlInternal::KviStyledControlInternal( KviStyledControl* control)
 :QObject(0)
 {
@@ -356,5 +354,3 @@ void KviStyledToolButton::resizeEvent ( QResizeEvent * e)
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "kvi_styled_controls.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
-#endif
diff --git a/src/kvirc/ui/kvi_styled_controls.h b/src/kvirc/ui/kvi_styled_controls.h
index 0c2f655e4..a8af9d5ce 100644
--- a/src/kvirc/ui/kvi_styled_controls.h
+++ b/src/kvirc/ui/kvi_styled_controls.h
@@ -32,12 +32,7 @@
 #include <QEvent>
 #include <QTimer>
 #include <QToolButton>
-/*
-#ifdef COMPILE_ON_MINGW
-        #define KviStyledCheckBox QCheckBox
-        #define KviStyledToolButton QToolButton
-#else
-*/
+
 class KviStyledControl;
 class KviTalToolBar;
 
@@ -106,6 +101,4 @@ protected:
 	virtual void resizeEvent ( QResizeEvent * );
 };
 
-
-
 #endif