Changeset 5942 for trunk/qt-gui

Timestamp:

12/09/07 02:59:55 (12 months ago)

Author:

eugene

Message:

Made licq not crash upon exit. Patch by erijo.

Location:

trunk/qt-gui/src

Files:

• licqgui.cpp (modified) (4 diffs)
• licqgui.h (modified) (1 diff)

trunk/qt-gui/src/licqgui.cpp

@@ -46 +46 @@
 #include <qstylefactory.h>
 
-CLicqGui *licqQtGui;
-
 const char *LP_Usage(void)
 {
@@ -143 +141 @@
 #endif
 
-  licqQtGui = new CLicqGui(gui_argc, gui_argv);
-
-  int nResult = licqQtGui->Run(_licqDaemon);
-  licqQtGui->Shutdown();
+  CLicqGui licqQtGui(gui_argc, gui_argv);
+
+  int nResult = licqQtGui.Run(_licqDaemon);
 
   gui_argc = 0;
@@ -330 +327 @@
 }
 
-void CLicqGui::Shutdown(void)
-{
-  gLog.Info("%sShutting down gui.\n", L_ENDxSTR);
-  gLog.ModifyService(S_PLUGIN, 0);
-  if(licqMainWindow) {
-    licqMainWindow->close();
-    delete licqMainWindow;
-    licqMainWindow = 0;
-  }
-
-  delete qApp;
-  qApp = 0;
-}
-
-
 int CLicqGui::Run(CICQDaemon *_licqDaemon)
 {
@@ -360 +342 @@
   int r = exec();
   _licqDaemon->UnregisterPlugin();
+  gLog.Info("%sShutting down gui.\n", L_ENDxSTR);
+  gLog.ModifyService(S_PLUGIN, 0);
 
   return r;

trunk/qt-gui/src/licqgui.h

@@ -47 +47 @@
   ~CLicqGui(void);
   int Run(CICQDaemon *);
-  void Shutdown(void);
   virtual bool x11EventFilter(XEvent *);