| author | mickeyl <mickeyl> | 2004-04-24 15:05:23 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2004-04-24 15:05:23 (UTC) |
| commit | 2b700fa535661eb1ac897797f318a2694397a4d6 (patch) (side-by-side diff) | |
| tree | 699a71bb1d457e7e2478addc9949094b3bd516d8 | |
| parent | 0625bd929da690aed72cdc0ee9772c9d298960c8 (diff) | |
| download | opie-2b700fa535661eb1ac897797f318a2694397a4d6.zip opie-2b700fa535661eb1ac897797f318a2694397a4d6.tar.gz opie-2b700fa535661eb1ac897797f318a2694397a4d6.tar.bz2 | |
gcc 3.4 fixlet
The inheritance brings Qt and QObject into class scope as private.
If you want to access Qt and QObject from within the class scope,
one has to do it via global scope (::Qt::...)
| -rw-r--r-- | noncore/settings/networksettings/ppp/pppmodule.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index b102a10..fb279ee 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp @@ -15,2 +15,3 @@ using namespace Opie::Core; /* QT */ +#include <qt.h> @@ -148,3 +149,3 @@ QWidget *PPPModule::configure(Interface *i) 0, "PPPConfig", false, - (Qt::WDestructiveClose | Qt::WStyle_ContextHelp)); + ::Qt::WDestructiveClose | ::Qt::WStyle_ContextHelp); return pppconfig; @@ -216,4 +217,4 @@ void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces) { - newIfaces.insert(QObject::tr("PPP") , - QObject::tr("generic ppp device")); + newIfaces.insert(::QObject::tr("PPP") , + ::QObject::tr("generic ppp device")); } |