From fa1ada4c5079414c05e4cb9ac73b0c66ddf0b75c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mikko=20Kein=C3=A4nen?= Date: Mon, 20 Dec 2010 01:04:42 +0200 Subject: [PATCH] Cleaned up commented out deprecated stuff. --- src/mainwindow.cpp | 112 ---------------------------------------------------- src/mainwindow.h | 42 -------------------- 2 files changed, 154 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index cbb3a10..caee9af 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -22,19 +22,10 @@ #include #include "mainwindow.h" #include "emulauncher.h" -// TODO: deprecated -//#include "platformdialog.h" #include "platformeditview.h" -//#include "mediatypedialog.h" #include "mediatypeeditview.h" -// TODO: DEPRECATED -//#include "mediaimagepathmaindialog.h" #include "filepatheditview.h" -// TODO: deprecated -//#include "setupmaindialog.h" #include "setupeditview.h" -// TODO: deprecated -//#include "executablemaindialog.h" #include "externalexecutableeditview.h" #include "externalexecutablemodel.h" #include "datfileutil.h" @@ -75,20 +66,10 @@ MainWindow::MainWindow(bool reset) createMenus(); createStatusBar(); readSettings(); - // TODO: deprecated - //platformDialog = 0; plfDialog = 0; - // TODO: deprecated - //mediaTypeDialog = 0; mdtDialog = 0; - // TODO: DEPRECATED - //mediaImagePathDialog = 0; mediaImagePathView = 0; - // TODO: deprecated - //setupMainDialog = 0; setupMainView = 0; - // TODO: deprecated - //executableMainDialog = 0; emulatorEditView = 0; } @@ -98,55 +79,28 @@ void MainWindow::connectSignals() void MainWindow::createActions() { - // TODO: deprecated - /*configPlatformAction = new QAction(tr("&Platforms"), this); - configPlatformAction->setStatusTip(tr("Configure platforms")); - connect(configPlatformAction, SIGNAL(triggered()), - this, SLOT(configurePlatforms()));*/ - configPlatformsAction = new QAction(tr("&Set Platforms"), this); configPlatformsAction->setStatusTip(tr("Add, edit and delete platforms")); connect(configPlatformsAction, SIGNAL(triggered()), this, SLOT(configurePlatformss())); - // TODO: deprecated - /*configMediaTypeAction = new QAction(tr("&Media Types"), this); - configMediaTypeAction->setStatusTip(tr("Configure media types")); - connect(configMediaTypeAction, SIGNAL(triggered()), this, SLOT(configureMediaTypes()));*/ - configMediaTypesAction = new QAction(tr("&Set Media Types"), this); configMediaTypesAction->setStatusTip(tr("Add, edit and delete media types")); connect(configMediaTypesAction, SIGNAL(triggered()), this, SLOT(configureMediaTypess())); - // TODO: DEPRECATED - /*configMediaImagePathAction = new QAction(tr("Media &Image Paths"), this); - configMediaImagePathAction->setStatusTip(tr("Configure media image file paths.")); - connect(configMediaImagePathAction, SIGNAL(triggered()), - this, SLOT(configureMediaImagePaths()));*/ - configMediaImagePathsAction = new QAction(tr("Set media &image paths"), this); configMediaImagePathsAction->setStatusTip(tr("Add, edit and delete media image file paths.")); connect(configMediaImagePathsAction, SIGNAL(triggered()), this, SLOT(configureMediaImagePathss())); - // TODO: deprecated - /*configSetupAction = new QAction(tr("S&etups"), this); - configSetupAction->setStatusTip(tr("Configure set ups")); - connect(configSetupAction, SIGNAL(triggered()), this, SLOT(configureSetups()));*/ - configSetupsAction = new QAction(tr("Configure S&etups"), this); configSetupsAction->setStatusTip(tr("Add, edit and delete setups")); connect(configSetupsAction, SIGNAL(triggered()), this, SLOT(configureSetupss())); - /*configEmulatorAction = new QAction(tr("Em&ulators"), this); - configEmulatorAction->setStatusTip(tr("Configure emulators")); - connect(configEmulatorAction, SIGNAL(triggered()), this, SLOT(configureEmulators()));*/ - configEmulatorsAction = new QAction(tr("Configure Em&ulators"), this); configEmulatorsAction->setStatusTip(tr("Add, edit and delete emulator configurations")); connect(configEmulatorsAction, SIGNAL(triggered()), this, SLOT(configureEmulatorss())); - configTmpDirAction = new QAction(tr("&Temp dir"), this); configTmpDirAction->setStatusTip(tr("Configure directory for temporary files.")); connect(configTmpDirAction, SIGNAL(triggered()), this, SLOT(configureTmpDir())); @@ -169,17 +123,6 @@ void MainWindow::createActions() connect(aboutAction, SIGNAL(triggered()), this, SLOT(about())); } -// TODO: deprecated -/*void MainWindow::configurePlatforms() -{ - if (!platformDialog) - { - platformDialog = new PlatformDialog(this); - connect(platformDialog, SIGNAL(finished(int)), this, SLOT(updateData())); - } - activateDialog(platformDialog); -}*/ - void MainWindow::configurePlatformss() { if (!plfDialog) { @@ -189,17 +132,6 @@ void MainWindow::configurePlatformss() activateDialog(plfDialog); } -// TODO: deprecated -/*void MainWindow::configureMediaTypes() -{ - if (!mediaTypeDialog) - { - mediaTypeDialog = new MediaTypeDialog(this); - connect(mediaTypeDialog, SIGNAL(finished(int)), this, SLOT(updateData())); - } - activateDialog(mediaTypeDialog); -}*/ - void MainWindow::configureMediaTypess() { if (!mdtDialog) @@ -210,17 +142,6 @@ void MainWindow::configureMediaTypess() activateDialog(mdtDialog); } - -// TODO: DEPRECATED -/*void MainWindow::configureMediaImagePaths() -{ - if (!mediaImagePathDialog) - { - mediaImagePathDialog = new MediaImagePathMainDialog(this); - } - activateDialog(mediaImagePathDialog); -}*/ - void MainWindow::configureMediaImagePathss() { if (!mediaImagePathView) @@ -230,17 +151,6 @@ void MainWindow::configureMediaImagePathss() activateDialog(mediaImagePathView); } -// TODO: deprecated -/*void MainWindow::configureSetups() -{ - if (!setupMainDialog) - { - setupMainDialog = new SetupMainDialog(this); - } - activateDialog(setupMainDialog); - setupMainDialog->refreshDataModel(); -}*/ - void MainWindow::configureSetupss() { if (!setupMainView) { @@ -249,18 +159,6 @@ void MainWindow::configureSetupss() activateDialog(setupMainView); } - -// TODO: deprecated -/*void MainWindow::configureEmulators() -{ - if (!executableMainDialog) { - executableMainDialog = new ExecutableMainDialog(this); - connect(executableMainDialog, SIGNAL(finished(int)), this, SLOT(updateData())); - } - activateDialog(executableMainDialog); - executableMainDialog->refreshDataModel(); -}*/ - void MainWindow::configureEmulatorss() { if (!emulatorEditView) { @@ -330,20 +228,10 @@ void MainWindow::createMenus() configMenu = menuBar()->addMenu(tr("&Config")); configMenu->addAction(configTmpDirAction); configMenu->addSeparator(); - // TODO: deprecated - //configMenu->addAction(configPlatformAction); configMenu->addAction(configPlatformsAction); - // TODO: deprecated - //configMenu->addAction(configMediaTypeAction); configMenu->addAction(configMediaTypesAction); - // TODO: deprecated - //configMenu->addAction(configSetupAction); configMenu->addAction(configSetupsAction); - // TODO: DEPRECATED - //configMenu->addAction(configMediaImagePathAction); configMenu->addAction(configMediaImagePathsAction); - // TODO: DEPRECATED - //configMenu->addAction(configEmulatorAction); configMenu->addAction(configEmulatorsAction); configMenu->addSeparator(); configMenu->addAction(manageDatFilesAction); diff --git a/src/mainwindow.h b/src/mainwindow.h index 2b6ff4a..68c935e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -24,23 +24,12 @@ #include class QAction; -// TODO: DEPRECATED -//class PlatformDialog; class PlatformEditView; class MediaTypeEditView; -// TODO: DEPRECATED -//class MediaTypeDialog; class MediaTypeEditView; -// TODO: DEPRECATED -//class MediaImagePathMainDialog; class FilePathEditView; -// TODO: DEPRECATED -//class SetupMainDialog; class SetupEditView; -// TODO: DEPRECATED -//class ExecutableMainDialog; class ExternalExecutableEditView; -//class TmpFolderEditDialog; class QLabel; class DatabaseManager; class EmuFrontDialog; @@ -64,20 +53,10 @@ protected: void closeEvent(QCloseEvent *event); private slots: - // TODO: DEPRECATED - //void configurePlatforms(); void configurePlatformss(); - // TODO: DEPRECATED - //void configureMediaTypes(); void configureMediaTypess(); - // TODO: DEPRECATED - //void configureMediaImagePaths(); void configureMediaImagePathss(); - // TODO: DEPRECATED - //void configureSetups(); void configureSetupss(); - // TODO: DEPRECATED - //void configureEmulators(); void configureEmulatorss(); void configureTmpDir(); void resetDb(); @@ -99,39 +78,18 @@ private: bool testDB(bool reset); void createDB() const; - // TODO: deprecated - //PlatformDialog *platformDialog; PlatformEditView *plfDialog; - // TODO: deprecated - //MediaTypeDialog *mediaTypeDialog; MediaTypeEditView *mdtDialog; - // TODO: DEPRECATED - //MediaImagePathMainDialog *mediaImagePathDialog; FilePathEditView *mediaImagePathView; - // TODO: deprecated - //SetupMainDialog *setupMainDialog; SetupEditView *setupMainView; - // TODO: deprecated - //ExecutableMainDialog *executableMainDialog; ExternalExecutableEditView *emulatorEditView; - //TmpFolderEditDialog *tmpFolderDialog; QMenu *configMenu; QMenu *fileMenu; QMenu *helpMenu; - // TODO: deprecated - //QAction *configPlatformAction; QAction *configPlatformsAction; - // TODO: deprecated - //QAction *configMediaTypeAction; QAction *configMediaTypesAction; - // TODO: DEPRECATED - //QAction *configMediaImagePathAction; QAction *configMediaImagePathsAction; - // TODO: deprecated - //QAction *configSetupAction; QAction *configSetupsAction; - // TODO: deprecated - //QAction *configEmulatorAction; QAction *configEmulatorsAction; QAction *exitAction; QAction *resetDbAction; -- 1.7.9.5