author | mickeyl <mickeyl> | 2003-01-23 13:28:51 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-01-23 13:28:51 (UTC) |
commit | c50f0f454936d5552bd05e55ac6934d2e63d1743 (patch) (unidiff) | |
tree | 74934d9fc5a22e523638a1baa036cbc60516df37 | |
parent | 6464e96567a07c3104b31292e8a23945b13d0da6 (diff) | |
download | opie-c50f0f454936d5552bd05e55ac6934d2e63d1743.zip opie-c50f0f454936d5552bd05e55ac6934d2e63d1743.tar.gz opie-c50f0f454936d5552bd05e55ac6934d2e63d1743.tar.bz2 |
- remove mocfiles
- g++ 3.2 fix (repeat after me... :-)
-rw-r--r-- | noncore/net/ubrowser/mainview.cpp | 2 | ||||
-rw-r--r-- | noncore/net/ubrowser/moc_httpcomm.cpp | 102 | ||||
-rw-r--r-- | noncore/net/ubrowser/moc_mainview.cpp | 88 |
3 files changed, 1 insertions, 191 deletions
diff --git a/noncore/net/ubrowser/mainview.cpp b/noncore/net/ubrowser/mainview.cpp index 87a7d6a..69d6632 100644 --- a/noncore/net/ubrowser/mainview.cpp +++ b/noncore/net/ubrowser/mainview.cpp | |||
@@ -1,88 +1,88 @@ | |||
1 | /* | 1 | /* |
2 | Opie-uBrowser. a very small web browser, using on QTextBrowser for html display/parsing | 2 | Opie-uBrowser. a very small web browser, using on QTextBrowser for html display/parsing |
3 | Copyright (C) 2002 Thomas Stephens | 3 | Copyright (C) 2002 Thomas Stephens |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public | 5 | This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public |
6 | License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later | 6 | License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later |
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | 17 | ||
18 | #include "mainview.h" | 18 | #include "mainview.h" |
19 | 19 | ||
20 | MainView::MainView(QWidget *parent=0, const char *name=0) : QMainWindow(parent, name) | 20 | MainView::MainView(QWidget *parent, const char *name) : QMainWindow(parent, name) |
21 | { | 21 | { |
22 | setCaption("uBrowser"); | 22 | setCaption("uBrowser"); |
23 | 23 | ||
24 | QPEToolBar *toolbar = new QPEToolBar(this, "toolbar"); | 24 | QPEToolBar *toolbar = new QPEToolBar(this, "toolbar"); |
25 | back = new QToolButton(Resource::loadPixmap("ubrowser/back"), 0, 0, 0, 0, toolbar, "back"); | 25 | back = new QToolButton(Resource::loadPixmap("ubrowser/back"), 0, 0, 0, 0, toolbar, "back"); |
26 | forward = new QToolButton(Resource::loadPixmap("ubrowser/forward"), 0, 0, 0, 0, toolbar, "forward"); | 26 | forward = new QToolButton(Resource::loadPixmap("ubrowser/forward"), 0, 0, 0, 0, toolbar, "forward"); |
27 | home = new QToolButton(Resource::loadPixmap("ubrowser/home"), 0, 0, 0, 0, toolbar, "home"); | 27 | home = new QToolButton(Resource::loadPixmap("ubrowser/home"), 0, 0, 0, 0, toolbar, "home"); |
28 | location = new QComboBox(true, toolbar, "location"); | 28 | location = new QComboBox(true, toolbar, "location"); |
29 | go = new QToolButton(Resource::loadPixmap("ubrowser/go"), 0, 0, 0, 0, toolbar, "go"); | 29 | go = new QToolButton(Resource::loadPixmap("ubrowser/go"), 0, 0, 0, 0, toolbar, "go"); |
30 | 30 | ||
31 | toolbar->setStretchableWidget(location); | 31 | toolbar->setStretchableWidget(location); |
32 | toolbar->setHorizontalStretchable(true); | 32 | toolbar->setHorizontalStretchable(true); |
33 | 33 | ||
34 | addToolBar(toolbar); | 34 | addToolBar(toolbar); |
35 | 35 | ||
36 | browser = new QTextBrowser(this, "browser"); | 36 | browser = new QTextBrowser(this, "browser"); |
37 | setCentralWidget(browser); | 37 | setCentralWidget(browser); |
38 | 38 | ||
39 | //make the button take you to the location | 39 | //make the button take you to the location |
40 | connect(go, SIGNAL(clicked()), this, SLOT(goClicked()) ); | 40 | connect(go, SIGNAL(clicked()), this, SLOT(goClicked()) ); |
41 | connect(location->lineEdit(), SIGNAL(returnPressed()), this, SLOT(goClicked()) ); | 41 | connect(location->lineEdit(), SIGNAL(returnPressed()), this, SLOT(goClicked()) ); |
42 | 42 | ||
43 | //make back, forward and home do their thing (isnt QTextBrowser great?) | 43 | //make back, forward and home do their thing (isnt QTextBrowser great?) |
44 | connect(back, SIGNAL(clicked()), browser, SLOT(backward()) ); | 44 | connect(back, SIGNAL(clicked()), browser, SLOT(backward()) ); |
45 | connect(forward, SIGNAL(clicked()), browser, SLOT(forward()) ); | 45 | connect(forward, SIGNAL(clicked()), browser, SLOT(forward()) ); |
46 | connect(home, SIGNAL(clicked()), browser, SLOT(home()) ); | 46 | connect(home, SIGNAL(clicked()), browser, SLOT(home()) ); |
47 | 47 | ||
48 | //make back and forward buttons be enabled, only when you can go back or forward (again, i love QTextBrowser) | 48 | //make back and forward buttons be enabled, only when you can go back or forward (again, i love QTextBrowser) |
49 | //this doesnt seem to work, but doesnt break anything either... | 49 | //this doesnt seem to work, but doesnt break anything either... |
50 | connect(browser, SIGNAL(backwardAvailable(bool)), back, SLOT(setOn(bool)) ); | 50 | connect(browser, SIGNAL(backwardAvailable(bool)), back, SLOT(setOn(bool)) ); |
51 | connect(browser, SIGNAL(forwardAvailable(bool)), forward, SLOT(setOn(bool)) ); | 51 | connect(browser, SIGNAL(forwardAvailable(bool)), forward, SLOT(setOn(bool)) ); |
52 | 52 | ||
53 | //notify me when the text of the browser has changed (like when the user clicks a link) | 53 | //notify me when the text of the browser has changed (like when the user clicks a link) |
54 | connect(browser, SIGNAL(textChanged()), this, SLOT(textChanged()) ); | 54 | connect(browser, SIGNAL(textChanged()), this, SLOT(textChanged()) ); |
55 | 55 | ||
56 | http = new HttpFactory(browser); | 56 | http = new HttpFactory(browser); |
57 | } | 57 | } |
58 | 58 | ||
59 | void MainView::goClicked() | 59 | void MainView::goClicked() |
60 | { | 60 | { |
61 | if(location->currentText().startsWith("http://") ) | 61 | if(location->currentText().startsWith("http://") ) |
62 | { | 62 | { |
63 | location->setEditText(location->currentText().lower()); | 63 | location->setEditText(location->currentText().lower()); |
64 | browser->setMimeSourceFactory(http); | 64 | browser->setMimeSourceFactory(http); |
65 | printf("MainView::goClicked: using http source factory\n"); | 65 | printf("MainView::goClicked: using http source factory\n"); |
66 | } | 66 | } |
67 | else | 67 | else |
68 | { | 68 | { |
69 | browser->setMimeSourceFactory(QMimeSourceFactory::defaultFactory()); | 69 | browser->setMimeSourceFactory(QMimeSourceFactory::defaultFactory()); |
70 | printf("MainView::goClicked: using default source factory\n"); | 70 | printf("MainView::goClicked: using default source factory\n"); |
71 | } | 71 | } |
72 | 72 | ||
73 | browser->setSource(location->currentText()); | 73 | browser->setSource(location->currentText()); |
74 | } | 74 | } |
75 | 75 | ||
76 | void MainView::textChanged() | 76 | void MainView::textChanged() |
77 | { | 77 | { |
78 | if(browser->documentTitle().isNull()) | 78 | if(browser->documentTitle().isNull()) |
79 | { | 79 | { |
80 | setCaption(browser->source() + " - uBrowser"); | 80 | setCaption(browser->source() + " - uBrowser"); |
81 | } | 81 | } |
82 | else | 82 | else |
83 | { | 83 | { |
84 | setCaption(browser->documentTitle() + " - uBrowser"); | 84 | setCaption(browser->documentTitle() + " - uBrowser"); |
85 | } | 85 | } |
86 | 86 | ||
87 | location->setEditText(browser->source()); | 87 | location->setEditText(browser->source()); |
88 | } | 88 | } |
diff --git a/noncore/net/ubrowser/moc_httpcomm.cpp b/noncore/net/ubrowser/moc_httpcomm.cpp deleted file mode 100644 index 5622531..0000000 --- a/noncore/net/ubrowser/moc_httpcomm.cpp +++ b/dev/null | |||
@@ -1,102 +0,0 @@ | |||
1 | /**************************************************************************** | ||
2 | ** HttpComm meta object code from reading C++ file 'httpcomm.h' | ||
3 | ** | ||
4 | ** Created: Thu Jul 25 10:24:04 2002 | ||
5 | ** by: The Qt MOC ($Id$) | ||
6 | ** | ||
7 | ** WARNING! All changes made in this file will be lost! | ||
8 | *****************************************************************************/ | ||
9 | |||
10 | #if !defined(Q_MOC_OUTPUT_REVISION) | ||
11 | #define Q_MOC_OUTPUT_REVISION 9 | ||
12 | #elif Q_MOC_OUTPUT_REVISION != 9 | ||
13 | #error "Moc format conflict - please regenerate all moc files" | ||
14 | #endif | ||
15 | |||
16 | #include "httpcomm.h" | ||
17 | #include <qmetaobject.h> | ||
18 | #include <qapplication.h> | ||
19 | |||
20 | |||
21 | |||
22 | const char *HttpComm::className() const | ||
23 | { | ||
24 | return "HttpComm"; | ||
25 | } | ||
26 | |||
27 | QMetaObject *HttpComm::metaObj = 0; | ||
28 | |||
29 | void HttpComm::initMetaObject() | ||
30 | { | ||
31 | if ( metaObj ) | ||
32 | return; | ||
33 | if ( qstrcmp(QObject::className(), "QObject") != 0 ) | ||
34 | badSuperclassWarning("HttpComm","QObject"); | ||
35 | (void) staticMetaObject(); | ||
36 | } | ||
37 | |||
38 | #ifndef QT_NO_TRANSLATION | ||
39 | |||
40 | QString HttpComm::tr(const char* s) | ||
41 | { | ||
42 | return qApp->translate( "HttpComm", s, 0 ); | ||
43 | } | ||
44 | |||
45 | QString HttpComm::tr(const char* s, const char * c) | ||
46 | { | ||
47 | return qApp->translate( "HttpComm", s, c ); | ||
48 | } | ||
49 | |||
50 | #endif // QT_NO_TRANSLATION | ||
51 | |||
52 | QMetaObject* HttpComm::staticMetaObject() | ||
53 | { | ||
54 | if ( metaObj ) | ||
55 | return metaObj; | ||
56 | (void) QObject::staticMetaObject(); | ||
57 | #ifndef QT_NO_PROPERTIES | ||
58 | #endif // QT_NO_PROPERTIES | ||
59 | typedef void (HttpComm::*m1_t0)(); | ||
60 | typedef void (QObject::*om1_t0)(); | ||
61 | typedef void (HttpComm::*m1_t1)(); | ||
62 | typedef void (QObject::*om1_t1)(); | ||
63 | typedef void (HttpComm::*m1_t2)(); | ||
64 | typedef void (QObject::*om1_t2)(); | ||
65 | typedef void (HttpComm::*m1_t3)(); | ||
66 | typedef void (QObject::*om1_t3)(); | ||
67 | m1_t0 v1_0 = &HttpComm::hostFound; | ||
68 | om1_t0 ov1_0 = (om1_t0)v1_0; | ||
69 | m1_t1 v1_1 = &HttpComm::connected; | ||
70 | om1_t1 ov1_1 = (om1_t1)v1_1; | ||
71 | m1_t2 v1_2 = &HttpComm::connectionClosed; | ||
72 | om1_t2 ov1_2 = (om1_t2)v1_2; | ||
73 | m1_t3 v1_3 = &HttpComm::incoming; | ||
74 | om1_t3 ov1_3 = (om1_t3)v1_3; | ||
75 | QMetaData *slot_tbl = QMetaObject::new_metadata(4); | ||
76 | QMetaData::Access *slot_tbl_access = QMetaObject::new_metaaccess(4); | ||
77 | slot_tbl[0].name = "hostFound()"; | ||
78 | slot_tbl[0].ptr = (QMember)ov1_0; | ||
79 | slot_tbl_access[0] = QMetaData::Public; | ||
80 | slot_tbl[1].name = "connected()"; | ||
81 | slot_tbl[1].ptr = (QMember)ov1_1; | ||
82 | slot_tbl_access[1] = QMetaData::Public; | ||
83 | slot_tbl[2].name = "connectionClosed()"; | ||
84 | slot_tbl[2].ptr = (QMember)ov1_2; | ||
85 | slot_tbl_access[2] = QMetaData::Public; | ||
86 | slot_tbl[3].name = "incoming()"; | ||
87 | slot_tbl[3].ptr = (QMember)ov1_3; | ||
88 | slot_tbl_access[3] = QMetaData::Public; | ||
89 | metaObj = QMetaObject::new_metaobject( | ||
90 | "HttpComm", "QObject", | ||
91 | slot_tbl, 4, | ||
92 | 0, 0, | ||
93 | #ifndef QT_NO_PROPERTIES | ||
94 | 0, 0, | ||
95 | 0, 0, | ||
96 | #endif // QT_NO_PROPERTIES | ||
97 | 0, 0 ); | ||
98 | metaObj->set_slot_access( slot_tbl_access ); | ||
99 | #ifndef QT_NO_PROPERTIES | ||
100 | #endif // QT_NO_PROPERTIES | ||
101 | return metaObj; | ||
102 | } | ||
diff --git a/noncore/net/ubrowser/moc_mainview.cpp b/noncore/net/ubrowser/moc_mainview.cpp deleted file mode 100644 index a188e12..0000000 --- a/noncore/net/ubrowser/moc_mainview.cpp +++ b/dev/null | |||
@@ -1,88 +0,0 @@ | |||
1 | /**************************************************************************** | ||
2 | ** MainView meta object code from reading C++ file 'mainview.h' | ||
3 | ** | ||
4 | ** Created: Thu Jul 25 10:24:03 2002 | ||
5 | ** by: The Qt MOC ($Id$) | ||
6 | ** | ||
7 | ** WARNING! All changes made in this file will be lost! | ||
8 | *****************************************************************************/ | ||
9 | |||
10 | #if !defined(Q_MOC_OUTPUT_REVISION) | ||
11 | #define Q_MOC_OUTPUT_REVISION 9 | ||
12 | #elif Q_MOC_OUTPUT_REVISION != 9 | ||
13 | #error "Moc format conflict - please regenerate all moc files" | ||
14 | #endif | ||
15 | |||
16 | #include "mainview.h" | ||
17 | #include <qmetaobject.h> | ||
18 | #include <qapplication.h> | ||
19 | |||
20 | |||
21 | |||
22 | const char *MainView::className() const | ||
23 | { | ||
24 | return "MainView"; | ||
25 | } | ||
26 | |||
27 | QMetaObject *MainView::metaObj = 0; | ||
28 | |||
29 | void MainView::initMetaObject() | ||
30 | { | ||
31 | if ( metaObj ) | ||
32 | return; | ||
33 | if ( qstrcmp(QMainWindow::className(), "QMainWindow") != 0 ) | ||
34 | badSuperclassWarning("MainView","QMainWindow"); | ||
35 | (void) staticMetaObject(); | ||
36 | } | ||
37 | |||
38 | #ifndef QT_NO_TRANSLATION | ||
39 | |||
40 | QString MainView::tr(const char* s) | ||
41 | { | ||
42 | return qApp->translate( "MainView", s, 0 ); | ||
43 | } | ||
44 | |||
45 | QString MainView::tr(const char* s, const char * c) | ||
46 | { | ||
47 | return qApp->translate( "MainView", s, c ); | ||
48 | } | ||
49 | |||
50 | #endif // QT_NO_TRANSLATION | ||
51 | |||
52 | QMetaObject* MainView::staticMetaObject() | ||
53 | { | ||
54 | if ( metaObj ) | ||
55 | return metaObj; | ||
56 | (void) QMainWindow::staticMetaObject(); | ||
57 | #ifndef QT_NO_PROPERTIES | ||
58 | #endif // QT_NO_PROPERTIES | ||
59 | typedef void (MainView::*m1_t0)(); | ||
60 | typedef void (QObject::*om1_t0)(); | ||
61 | typedef void (MainView::*m1_t1)(); | ||
62 | typedef void (QObject::*om1_t1)(); | ||
63 | m1_t0 v1_0 = &MainView::goClicked; | ||
64 | om1_t0 ov1_0 = (om1_t0)v1_0; | ||
65 | m1_t1 v1_1 = &MainView::textChanged; | ||
66 | om1_t1 ov1_1 = (om1_t1)v1_1; | ||
67 | QMetaData *slot_tbl = QMetaObject::new_metadata(2); | ||
68 | QMetaData::Access *slot_tbl_access = QMetaObject::new_metaaccess(2); | ||
69 | slot_tbl[0].name = "goClicked()"; | ||
70 | slot_tbl[0].ptr = (QMember)ov1_0; | ||
71 | slot_tbl_access[0] = QMetaData::Public; | ||
72 | slot_tbl[1].name = "textChanged()"; | ||
73 | slot_tbl[1].ptr = (QMember)ov1_1; | ||
74 | slot_tbl_access[1] = QMetaData::Public; | ||
75 | metaObj = QMetaObject::new_metaobject( | ||
76 | "MainView", "QMainWindow", | ||
77 | slot_tbl, 2, | ||
78 | 0, 0, | ||
79 | #ifndef QT_NO_PROPERTIES | ||
80 | 0, 0, | ||
81 | 0, 0, | ||
82 | #endif // QT_NO_PROPERTIES | ||
83 | 0, 0 ); | ||
84 | metaObj->set_slot_access( slot_tbl_access ); | ||
85 | #ifndef QT_NO_PROPERTIES | ||
86 | #endif // QT_NO_PROPERTIES | ||
87 | return metaObj; | ||
88 | } | ||