Mercurial > octave-nkf
changeset 17974:866d3860724c
add missing Q_OBJECT macros
* resource-manager.h: inherits from QObject, Q_OBJECT added
* welcome-wizard.cc: removed class definitions for initial_page,
setup_community_news, and final_page from here except for constructors
* welcome-wizard.h: added class definitions with macro Q_OBJECT
for initial_page, setup_community_news, and final_page
* libgui/src/module.mk: added moc-resource-manager.cc to octave_gui_MOC
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Thu, 21 Nov 2013 20:32:52 +0100 |
| parents | 6925dca34807 |
| children | 542be31e0ccc |
| files | libgui/src/module.mk libgui/src/resource-manager.h libgui/src/welcome-wizard.cc libgui/src/welcome-wizard.h |
| diffstat | 4 files changed, 86 insertions(+), 62 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/module.mk Thu Nov 21 17:17:55 2013 +0100 +++ b/libgui/src/module.mk Thu Nov 21 20:32:52 2013 +0100 @@ -95,6 +95,7 @@ src/moc-settings-dialog.cc \ src/moc-terminal-dock-widget.cc \ src/moc-color-picker.cc \ + src/moc-resource-manager.cc \ src/moc-welcome-wizard.cc \ src/moc-workspace-model.cc \ src/moc-workspace-view.cc \
--- a/libgui/src/resource-manager.h Thu Nov 21 17:17:55 2013 +0100 +++ b/libgui/src/resource-manager.h Thu Nov 21 20:32:52 2013 +0100 @@ -29,13 +29,15 @@ #include <QSettings> #include <QTranslator> -class resource_manager +class resource_manager : public QObject { + Q_OBJECT + protected: - resource_manager (void); +public: -public: + resource_manager (void); ~resource_manager ();
--- a/libgui/src/welcome-wizard.cc Thu Nov 21 17:17:55 2013 +0100 +++ b/libgui/src/welcome-wizard.cc Thu Nov 21 20:32:52 2013 +0100 @@ -26,8 +26,6 @@ #endif #include <QApplication> -#include <QCheckBox> -#include <QLabel> #include <QPushButton> #include <QHBoxLayout> #include <QVBoxLayout> @@ -44,11 +42,9 @@ return logo; }; -class initial_page : public QWidget -{ -public: + - initial_page (welcome_wizard *wizard) +initial_page::initial_page (welcome_wizard *wizard) : QWidget (wizard), title (new QLabel (tr ("Welcome to Octave!"), this)), message (new QLabel (this)), @@ -101,25 +97,9 @@ connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); } - ~initial_page (void) { } - static QWidget * - create (welcome_wizard *wizard) { return new initial_page (wizard); } - -private: - QLabel *title; - QLabel *message; - QLabel *logo; - QPushButton *next; - QPushButton *cancel; -}; - -class setup_community_news : public QWidget -{ -public: - - setup_community_news (welcome_wizard *wizard) +setup_community_news::setup_community_news (welcome_wizard *wizard) : QWidget (wizard), title (new QLabel (tr ("Community News"), this)), message (new QLabel (this)), @@ -208,28 +188,8 @@ connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); } - ~setup_community_news (void) { } - static QWidget * - create (welcome_wizard *wizard) { return new setup_community_news (wizard); } - -private: - - QLabel *title; - QLabel *message; - QCheckBox *checkbox; - QLabel *checkbox_message; - QLabel *logo; - QPushButton *previous; - QPushButton *next; - QPushButton *cancel; -}; - -class final_page : public QWidget -{ -public: - - final_page (welcome_wizard *wizard) +final_page::final_page (welcome_wizard *wizard) : QWidget (wizard), title (new QLabel (tr ("Enjoy!"), this)), message (new QLabel (this)), @@ -304,21 +264,6 @@ connect (cancel, SIGNAL (clicked ()), wizard, SLOT (reject ())); } - ~final_page (void) { } - - static QWidget * - create (welcome_wizard *wizard) { return new final_page (wizard); } - -private: - - QLabel *title; - QLabel *message; - QLabel *logo; - QLabel *links; - QPushButton *previous; - QPushButton *finish; - QPushButton *cancel; -}; welcome_wizard::welcome_wizard (QWidget *p) : QDialog (p), page_ctor_list (), page_list_iterator (),
--- a/libgui/src/welcome-wizard.h Thu Nov 21 17:17:55 2013 +0100 +++ b/libgui/src/welcome-wizard.h Thu Nov 21 20:32:52 2013 +0100 @@ -25,6 +25,8 @@ #define WELCOMEWIZARD_H #include <QDialog> +#include <QCheckBox> +#include <QLabel> class welcome_wizard : public QDialog { @@ -56,4 +58,78 @@ void accept (void); }; + +class initial_page : public QWidget +{ + Q_OBJECT + +public: + + initial_page (welcome_wizard *wizard); + + ~initial_page (void) { } + + static QWidget * + create (welcome_wizard *wizard) { return new initial_page (wizard); } + +private: + + QLabel *title; + QLabel *message; + QLabel *logo; + QPushButton *next; + QPushButton *cancel; +}; + + +class setup_community_news : public QWidget +{ + Q_OBJECT + +public: + + setup_community_news (welcome_wizard *wizard); + + ~setup_community_news (void) { } + + static QWidget * + create (welcome_wizard *wizard) { return new setup_community_news (wizard); } + +private: + + QLabel *title; + QLabel *message; + QCheckBox *checkbox; + QLabel *checkbox_message; + QLabel *logo; + QPushButton *previous; + QPushButton *next; + QPushButton *cancel; +}; + + +class final_page : public QWidget +{ + Q_OBJECT + +public: + + final_page (welcome_wizard *wizard); + + ~final_page (void) { } + + static QWidget * + create (welcome_wizard *wizard) { return new final_page (wizard); } + +private: + + QLabel *title; + QLabel *message; + QLabel *logo; + QLabel *links; + QPushButton *previous; + QPushButton *finish; + QPushButton *cancel; +}; + #endif // WELCOMEWIZARD_H