summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-01-23 13:28:51 (UTC)
committer mickeyl <mickeyl>2003-01-23 13:28:51 (UTC)
commitc50f0f454936d5552bd05e55ac6934d2e63d1743 (patch) (side-by-side diff)
tree74934d9fc5a22e523638a1baa036cbc60516df37
parent6464e96567a07c3104b31292e8a23945b13d0da6 (diff)
downloadopie-c50f0f454936d5552bd05e55ac6934d2e63d1743.zip
opie-c50f0f454936d5552bd05e55ac6934d2e63d1743.tar.gz
opie-c50f0f454936d5552bd05e55ac6934d2e63d1743.tar.bz2
- remove mocfiles
- g++ 3.2 fix (repeat after me... :-)
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/ubrowser/mainview.cpp2
-rw-r--r--noncore/net/ubrowser/moc_httpcomm.cpp102
-rw-r--r--noncore/net/ubrowser/moc_mainview.cpp88
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 @@
/*
Opie-uBrowser. a very small web browser, using on QTextBrowser for html display/parsing
Copyright (C) 2002 Thomas Stephens
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 2 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, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "mainview.h"
-MainView::MainView(QWidget *parent=0, const char *name=0) : QMainWindow(parent, name)
+MainView::MainView(QWidget *parent, const char *name) : QMainWindow(parent, name)
{
setCaption("uBrowser");
QPEToolBar *toolbar = new QPEToolBar(this, "toolbar");
back = new QToolButton(Resource::loadPixmap("ubrowser/back"), 0, 0, 0, 0, toolbar, "back");
forward = new QToolButton(Resource::loadPixmap("ubrowser/forward"), 0, 0, 0, 0, toolbar, "forward");
home = new QToolButton(Resource::loadPixmap("ubrowser/home"), 0, 0, 0, 0, toolbar, "home");
location = new QComboBox(true, toolbar, "location");
go = new QToolButton(Resource::loadPixmap("ubrowser/go"), 0, 0, 0, 0, toolbar, "go");
toolbar->setStretchableWidget(location);
toolbar->setHorizontalStretchable(true);
addToolBar(toolbar);
browser = new QTextBrowser(this, "browser");
setCentralWidget(browser);
//make the button take you to the location
connect(go, SIGNAL(clicked()), this, SLOT(goClicked()) );
connect(location->lineEdit(), SIGNAL(returnPressed()), this, SLOT(goClicked()) );
//make back, forward and home do their thing (isnt QTextBrowser great?)
connect(back, SIGNAL(clicked()), browser, SLOT(backward()) );
connect(forward, SIGNAL(clicked()), browser, SLOT(forward()) );
connect(home, SIGNAL(clicked()), browser, SLOT(home()) );
//make back and forward buttons be enabled, only when you can go back or forward (again, i love QTextBrowser)
//this doesnt seem to work, but doesnt break anything either...
connect(browser, SIGNAL(backwardAvailable(bool)), back, SLOT(setOn(bool)) );
connect(browser, SIGNAL(forwardAvailable(bool)), forward, SLOT(setOn(bool)) );
//notify me when the text of the browser has changed (like when the user clicks a link)
connect(browser, SIGNAL(textChanged()), this, SLOT(textChanged()) );
http = new HttpFactory(browser);
}
void MainView::goClicked()
{
if(location->currentText().startsWith("http://") )
{
location->setEditText(location->currentText().lower());
browser->setMimeSourceFactory(http);
printf("MainView::goClicked: using http source factory\n");
}
else
{
browser->setMimeSourceFactory(QMimeSourceFactory::defaultFactory());
printf("MainView::goClicked: using default source factory\n");
}
browser->setSource(location->currentText());
}
void MainView::textChanged()
{
if(browser->documentTitle().isNull())
{
setCaption(browser->source() + " - uBrowser");
}
else
{
setCaption(browser->documentTitle() + " - uBrowser");
}
location->setEditText(browser->source());
}
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 @@
-/****************************************************************************
-** HttpComm meta object code from reading C++ file 'httpcomm.h'
-**
-** Created: Thu Jul 25 10:24:04 2002
-** by: The Qt MOC ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-*****************************************************************************/
-
-#if !defined(Q_MOC_OUTPUT_REVISION)
-#define Q_MOC_OUTPUT_REVISION 9
-#elif Q_MOC_OUTPUT_REVISION != 9
-#error "Moc format conflict - please regenerate all moc files"
-#endif
-
-#include "httpcomm.h"
-#include <qmetaobject.h>
-#include <qapplication.h>
-
-
-
-const char *HttpComm::className() const
-{
- return "HttpComm";
-}
-
-QMetaObject *HttpComm::metaObj = 0;
-
-void HttpComm::initMetaObject()
-{
- if ( metaObj )
- return;
- if ( qstrcmp(QObject::className(), "QObject") != 0 )
- badSuperclassWarning("HttpComm","QObject");
- (void) staticMetaObject();
-}
-
-#ifndef QT_NO_TRANSLATION
-
-QString HttpComm::tr(const char* s)
-{
- return qApp->translate( "HttpComm", s, 0 );
-}
-
-QString HttpComm::tr(const char* s, const char * c)
-{
- return qApp->translate( "HttpComm", s, c );
-}
-
-#endif // QT_NO_TRANSLATION
-
-QMetaObject* HttpComm::staticMetaObject()
-{
- if ( metaObj )
- return metaObj;
- (void) QObject::staticMetaObject();
-#ifndef QT_NO_PROPERTIES
-#endif // QT_NO_PROPERTIES
- typedef void (HttpComm::*m1_t0)();
- typedef void (QObject::*om1_t0)();
- typedef void (HttpComm::*m1_t1)();
- typedef void (QObject::*om1_t1)();
- typedef void (HttpComm::*m1_t2)();
- typedef void (QObject::*om1_t2)();
- typedef void (HttpComm::*m1_t3)();
- typedef void (QObject::*om1_t3)();
- m1_t0 v1_0 = &HttpComm::hostFound;
- om1_t0 ov1_0 = (om1_t0)v1_0;
- m1_t1 v1_1 = &HttpComm::connected;
- om1_t1 ov1_1 = (om1_t1)v1_1;
- m1_t2 v1_2 = &HttpComm::connectionClosed;
- om1_t2 ov1_2 = (om1_t2)v1_2;
- m1_t3 v1_3 = &HttpComm::incoming;
- om1_t3 ov1_3 = (om1_t3)v1_3;
- QMetaData *slot_tbl = QMetaObject::new_metadata(4);
- QMetaData::Access *slot_tbl_access = QMetaObject::new_metaaccess(4);
- slot_tbl[0].name = "hostFound()";
- slot_tbl[0].ptr = (QMember)ov1_0;
- slot_tbl_access[0] = QMetaData::Public;
- slot_tbl[1].name = "connected()";
- slot_tbl[1].ptr = (QMember)ov1_1;
- slot_tbl_access[1] = QMetaData::Public;
- slot_tbl[2].name = "connectionClosed()";
- slot_tbl[2].ptr = (QMember)ov1_2;
- slot_tbl_access[2] = QMetaData::Public;
- slot_tbl[3].name = "incoming()";
- slot_tbl[3].ptr = (QMember)ov1_3;
- slot_tbl_access[3] = QMetaData::Public;
- metaObj = QMetaObject::new_metaobject(
- "HttpComm", "QObject",
- slot_tbl, 4,
- 0, 0,
-#ifndef QT_NO_PROPERTIES
- 0, 0,
- 0, 0,
-#endif // QT_NO_PROPERTIES
- 0, 0 );
- metaObj->set_slot_access( slot_tbl_access );
-#ifndef QT_NO_PROPERTIES
-#endif // QT_NO_PROPERTIES
- return metaObj;
-}
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 @@
-/****************************************************************************
-** MainView meta object code from reading C++ file 'mainview.h'
-**
-** Created: Thu Jul 25 10:24:03 2002
-** by: The Qt MOC ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-*****************************************************************************/
-
-#if !defined(Q_MOC_OUTPUT_REVISION)
-#define Q_MOC_OUTPUT_REVISION 9
-#elif Q_MOC_OUTPUT_REVISION != 9
-#error "Moc format conflict - please regenerate all moc files"
-#endif
-
-#include "mainview.h"
-#include <qmetaobject.h>
-#include <qapplication.h>
-
-
-
-const char *MainView::className() const
-{
- return "MainView";
-}
-
-QMetaObject *MainView::metaObj = 0;
-
-void MainView::initMetaObject()
-{
- if ( metaObj )
- return;
- if ( qstrcmp(QMainWindow::className(), "QMainWindow") != 0 )
- badSuperclassWarning("MainView","QMainWindow");
- (void) staticMetaObject();
-}
-
-#ifndef QT_NO_TRANSLATION
-
-QString MainView::tr(const char* s)
-{
- return qApp->translate( "MainView", s, 0 );
-}
-
-QString MainView::tr(const char* s, const char * c)
-{
- return qApp->translate( "MainView", s, c );
-}
-
-#endif // QT_NO_TRANSLATION
-
-QMetaObject* MainView::staticMetaObject()
-{
- if ( metaObj )
- return metaObj;
- (void) QMainWindow::staticMetaObject();
-#ifndef QT_NO_PROPERTIES
-#endif // QT_NO_PROPERTIES
- typedef void (MainView::*m1_t0)();
- typedef void (QObject::*om1_t0)();
- typedef void (MainView::*m1_t1)();
- typedef void (QObject::*om1_t1)();
- m1_t0 v1_0 = &MainView::goClicked;
- om1_t0 ov1_0 = (om1_t0)v1_0;
- m1_t1 v1_1 = &MainView::textChanged;
- om1_t1 ov1_1 = (om1_t1)v1_1;
- QMetaData *slot_tbl = QMetaObject::new_metadata(2);
- QMetaData::Access *slot_tbl_access = QMetaObject::new_metaaccess(2);
- slot_tbl[0].name = "goClicked()";
- slot_tbl[0].ptr = (QMember)ov1_0;
- slot_tbl_access[0] = QMetaData::Public;
- slot_tbl[1].name = "textChanged()";
- slot_tbl[1].ptr = (QMember)ov1_1;
- slot_tbl_access[1] = QMetaData::Public;
- metaObj = QMetaObject::new_metaobject(
- "MainView", "QMainWindow",
- slot_tbl, 2,
- 0, 0,
-#ifndef QT_NO_PROPERTIES
- 0, 0,
- 0, 0,
-#endif // QT_NO_PROPERTIES
- 0, 0 );
- metaObj->set_slot_access( slot_tbl_access );
-#ifndef QT_NO_PROPERTIES
-#endif // QT_NO_PROPERTIES
- return metaObj;
-}