From: timoph Date: Sun, 3 Jan 2010 07:15:21 +0000 (+0000) Subject: Removing redundant class X-Git-Tag: 0.7.2~26 X-Git-Url: http://git.maemo.org/git/?p=impuzzle;a=commitdiff_plain;h=0ba8446d04e6ee10ebef0eb4a91f430b1e5bd7b5;ds=sidebyside Removing redundant class git-svn-id: file:///svnroot/impuzzle/trunk@8 e6bec12f-0854-4cc4-ad26-6875f1509f77 --- diff --git a/src/newgamedialog.cpp b/src/newgamedialog.cpp deleted file mode 100644 index 2168e4c..0000000 --- a/src/newgamedialog.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - Image Puzzle - A set your pieces straight game - Copyright (C) 2009 Timo Härkönen - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - */ - -#include "newgamedialog.h" - -#include -#include -#include -#include -#include -#include - -NewGameDialog::NewGameDialog(QWidget *parent) : - QDialog(parent) -{ - imageLabel_ = new QLabel(tr("Select image")); - imageCombo_ = new QComboBox; - - piecesLabel_ = new QLabel(tr("Set piece count")); - piecesCombo_ = new QComboBox; - - QStringList pieceList; - pieceList << "12" << "20" << "30"; - piecesCombo_->addItems(pieceList); - - comboLayout_ = new QHBoxLayout; - comboLayout_->addWidget(imageLabel_); - comboLayout_->addWidget(imageCombo_); - comboLayout_->addStretch(); - - startButton_ = new QPushButton(tr("Start")); - - buttonLayout_ = new QHBoxLayout; - buttonLayout_->addWidget(piecesLabel_); - buttonLayout_->addWidget(piecesCombo_); - buttonLayout_->addStretch(); - buttonLayout_->addWidget(startButton_); - - mainLayout_ = new QVBoxLayout; - mainLayout_->addLayout(comboLayout_); - mainLayout_->addLayout(buttonLayout_); - - setLayout(mainLayout_); - - //connect(startButton_, SIGNAL(clicked())) -} diff --git a/src/newgamedialog.h b/src/newgamedialog.h deleted file mode 100644 index 30bcf7f..0000000 --- a/src/newgamedialog.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - Image Puzzle - A set your pieces straight game - Copyright (C) 2009 Timo Härkönen - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - */ - -#ifndef NEWGAMEDIALOG_H -#define NEWGAMEDIALOG_H - -#include - -class QLabel; -class QComboBox; -class QPushButton; -class QVBoxLayout; -class QHBoxLayout; - -class NewGameDialog : public QDialog -{ - Q_OBJECT - -public: - NewGameDialog(QWidget *parent = 0); - -private: - QLabel *imageLabel_; - QLabel *piecesLabel_; - - QComboBox *imageCombo_; - QComboBox *piecesCombo_; - - QPushButton *startButton_; - - QVBoxLayout *mainLayout_; - QHBoxLayout *comboLayout_; - QHBoxLayout *buttonLayout_; -}; - -#endif // NEWGAMEDIALOG_H diff --git a/src/src.pro b/src/src.pro index de7ab4e..71f8d8b 100644 --- a/src/src.pro +++ b/src/src.pro @@ -9,7 +9,6 @@ HEADERS += gameview.h \ mainwindow.h \ imageimporter.h \ puzzleitem.h \ - newgamedialog.h \ defines.h \ introitem.h \ settings.h \ @@ -20,7 +19,6 @@ SOURCES += gameview.cpp \ mainwindow.cpp \ imageimporter.cpp \ puzzleitem.cpp \ - newgamedialog.cpp \ introitem.cpp \ settings.cpp \ settingsdialog.cpp