From 3f06af61944e10c44eb9cf794f4f9fe45ee5b2e1 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Tue, 13 Jul 2010 21:27:04 +0000
Subject: [PATCH] fixing many destruktors

---
 src/gui/qt/gametable/gametableimpl.cpp           |  2 --
 src/gui/qt/gametable/log/log.cpp                 |  3 ---
 src/gui/qt/settingsdialog/settingsdialogimpl.cpp |  4 ++++
 src/gui/qt/settingsdialog/settingsdialogimpl.h   |  4 +++-
 src/gui/qt/sound/sdlplayer.cpp                   |  4 ++--
 src/gui/qt/startwindow/startwindowimpl.cpp       | 13 -------------
 src/pokerth.cpp                                  |  7 ++++---
 src/session.cpp                                  |  2 --
 8 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 4e3e9326..5da0fe3f 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -518,8 +518,6 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 
 gameTableImpl::~gameTableImpl() {
 
-    delete myConfig;
-    myConfig = 0;
 
 }
 
diff --git a/src/gui/qt/gametable/log/log.cpp b/src/gui/qt/gametable/log/log.cpp
index 68324c70..54ee05c7 100755
--- a/src/gui/qt/gametable/log/log.cpp
+++ b/src/gui/qt/gametable/log/log.cpp
@@ -197,13 +197,10 @@ Log::Log(gameTableImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(0), my
 
 Log::~Log()
 {
-    cerr << "log destruktor";
-    delete myConfig;
     delete myLogDir;
     delete myHtmlLogFile;
     delete mySqliteLogDb;
 
-    myConfig = 0;
 }
 
 void Log::closeLogDbAtExit()
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index f170e301..d30846eb 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -127,6 +127,10 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
 
 }
 
+settingsDialogImpl::~settingsDialogImpl()
+{
+}
+
 void settingsDialogImpl::prepareDialog()
 {
     playerNickIsChanged = FALSE;
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h
index 5fcacef5..fbf7988c 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.h
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.h
@@ -41,6 +41,8 @@ Q_OBJECT
 public:
     settingsDialogImpl(QWidget *parent = 0, ConfigFile *c = 0, selectAvatarDialogImpl *s = 0);
 
+    ~settingsDialogImpl();
+
         void prepareDialog();
 	void exec();
 
@@ -117,7 +119,7 @@ private:
 	std::list<std::string> myCardDeckStylesList;
 	
 	ConfigFile* myConfig;
-	boost::shared_ptr<selectAvatarDialogImpl> mySelectAvatarDialogImpl;
+        selectAvatarDialogImpl *mySelectAvatarDialogImpl;
 	manualBlindsOrderDialogImpl *myManualBlindsOrderDialog; 
 
 	QString myAppDataPath;
diff --git a/src/gui/qt/sound/sdlplayer.cpp b/src/gui/qt/sound/sdlplayer.cpp
index 3e7949a4..d7a43ff3 100644
--- a/src/gui/qt/sound/sdlplayer.cpp
+++ b/src/gui/qt/sound/sdlplayer.cpp
@@ -22,8 +22,8 @@ using namespace std;
 SDLPlayer::SDLPlayer(ConfigFile *c)
 : soundData(NULL), currentChannel(0) , audioEnabled(0), myConfig(c)
 {
-	SDL_Init(SDL_INIT_AUDIO);
-	initAudio();
+        SDL_Init(SDL_INIT_AUDIO);
+        initAudio();
 
 	myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
 }
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
index a08d19ec..3a92a0b7 100644
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -176,19 +176,6 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
 
 startWindowImpl::~startWindowImpl()
 {
-//    delete myNewGameDialog;
-//    delete mySelectAvatarDialog;
-//    delete mySettingsDialog;
-//    delete myChangeHumanPlayerNameDialog;
-//    delete myJoinNetworkGameDialog;
-//    delete myConnectToServerDialog;
-//    delete myStartNetworkGameDialog;
-//    delete myCreateNetworkGameDialog;
-//    delete myAboutPokerthDialog;
-//    delete myGameLobbyDialog;
-//    delete myTimeoutDialog;
-//    delete myServerListDialog;
-//    delete myInternetGameLoginDialog;
 }
 
 void startWindowImpl::callNewGameDialog() {
diff --git a/src/pokerth.cpp b/src/pokerth.cpp
index 2c40a1d7..4d1eb3b3 100755
--- a/src/pokerth.cpp
+++ b/src/pokerth.cpp
@@ -147,14 +147,15 @@ int main( int argc, char **argv )
         qRegisterMetaType<DenyGameInvitationReason>("DenyGameInvitationReason");
 	///////////////////////////////////////////////////	
 
-	startWindowImpl *mainWin = new startWindowImpl(myConfig);	
-
-	a.setActivationWindow(mainWin, true);
+        startWindowImpl mainWin(myConfig);
+                a.setActivationWindow(&mainWin, true);
 
 	int retVal = a.exec();
 	
 	curl_global_cleanup();
 	socket_cleanup();
+        
+        
 	return retVal;
 	
 }
diff --git a/src/session.cpp b/src/session.cpp
index d9ec4cbf..c5aa8054 100755
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -54,8 +54,6 @@ Session::~Session()
 {
     terminateNetworkClient();
     terminateNetworkServer();
-    delete myConfig;
-    myConfig = 0;
     delete myQtToolsInterface;
     myQtToolsInterface = 0;
 }