author | zecke <zecke> | 2004-08-02 20:56:51 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-02 20:56:51 (UTC) |
commit | 71d9599c95d5ac03d080547763aac5b1b11d5e31 (patch) (side-by-side diff) | |
tree | 9adb23b4c129a2a6e11a4760a4b9e8b3df1bd858 | |
parent | 3e1ea773a9f480c5a356d8735e2622f108ffeed5 (diff) | |
download | opie-71d9599c95d5ac03d080547763aac5b1b11d5e31.zip opie-71d9599c95d5ac03d080547763aac5b1b11d5e31.tar.gz opie-71d9599c95d5ac03d080547763aac5b1b11d5e31.tar.bz2 |
Do not include "qpeapplication.h" this way but use <qpe/qpeapplication.h>
this could help Opie/X11 build
-rw-r--r-- | library/network.cpp | 12 | ||||
-rw-r--r-- | library/qpedialog.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/library/network.cpp b/library/network.cpp index df28857..f2a673c 100644 --- a/library/network.cpp +++ b/library/network.cpp @@ -1,75 +1,75 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #define QTOPIA_INTERNAL_LANGLIST -#include "qpe/network.h" -#include "qpe/networkinterface.h" -#include "qpe/global.h" -#include "qpe/config.h" -#include "qpe/resource.h" -#include "qpe/qpeapplication.h" +#include <qpe/network.h> +#include <qpe/networkinterface.h> +#include <qpe/global.h> +#include <qpe/config.h> +#include <qpe/resource.h> +#include <qpe/qpeapplication.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/qlibrary.h> #include <qlistbox.h> #include <qdir.h> #include <qlayout.h> #include <qdict.h> #include <qtranslator.h> #include <stdlib.h> #ifndef QT_NO_COP class NetworkEmitter : public QCopChannel { Q_OBJECT public: NetworkEmitter() : QCopChannel("QPE/Network",qApp) { } void receive(const QCString &msg, const QByteArray&) { if ( msg == "choicesChanged()" ) emit changed(); } signals: void changed(); }; /*! \internal Requests that the service \a choice be started. The \a password is the password to use if required. */ void Network::start(const QString& choice, const QString& password) { QCopEnvelope e("QPE/Network", "start(QString,QString)"); e << choice << password; } /*! \class Network network.h \brief The Network class provides network access functionality. \internal */ // copy the proxy settings of the active config over to the Proxies.conf file diff --git a/library/qpedialog.cpp b/library/qpedialog.cpp index 87d61e3..f52171f 100644 --- a/library/qpedialog.cpp +++ b/library/qpedialog.cpp @@ -1,73 +1,73 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "qpedialog.h" #include <qdialog.h> -#include "qpeapplication.h" +#include <qpeapplication.h> // Allow access to nornally protected accept and reject functions class HackedPrivateQDialog : public QDialog{ public: void accept() { QDialog::accept();} void reject() { QDialog::reject();} }; /** * \brief This is the only c'tor. * * The parent of this Listener is the Dialog you pass. This means once * the dialog is deleted this listener will be deleted too. * This Listener listens on QPEApplication::appMessage signal and implements * accept() and reject(). * * \code * QDialog *dialog = new YourDialog(); (void)new QPEDialogListener(dialog); if( QPEApplication::execDialog(dialog) == QDialog::Accept ){ // do some stuff } delete dialog; * \endcode * * @param di The dialog to handle */ QPEDialogListener::QPEDialogListener(QDialog *di ) : QObject(di) { dialog = di; connect(qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), this, SLOT(appMessage(const QCString&,const QByteArray&)) ); } /** * d'tor */ QPEDialogListener::~QPEDialogListener() {} /** * \internal */ void QPEDialogListener::appMessage( const QCString &msg, const QByteArray & ) { |