summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-24 15:05:23 (UTC)
committer mickeyl <mickeyl>2004-04-24 15:05:23 (UTC)
commit2b700fa535661eb1ac897797f318a2694397a4d6 (patch) (unidiff)
tree699a71bb1d457e7e2478addc9949094b3bd516d8
parent0625bd929da690aed72cdc0ee9772c9d298960c8 (diff)
downloadopie-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::...)
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings/ppp/pppmodule.cpp7
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
@@ -13,6 +13,7 @@
13using namespace Opie::Core; 13using namespace Opie::Core;
14 14
15/* QT */ 15/* QT */
16#include <qt.h>
16 17
17/* STD */ 18/* STD */
18#include <errno.h> 19#include <errno.h>
@@ -146,7 +147,7 @@ QWidget *PPPModule::configure(Interface *i)
146 odebug << "return ModemWidget" << oendl; 147 odebug << "return ModemWidget" << oendl;
147 PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i, 148 PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i,
148 0, "PPPConfig", false, 149 0, "PPPConfig", false,
149 (Qt::WDestructiveClose | Qt::WStyle_ContextHelp)); 150 ::Qt::WDestructiveClose | ::Qt::WStyle_ContextHelp);
150 return pppconfig; 151 return pppconfig;
151} 152}
152 153
@@ -214,8 +215,8 @@ bool PPPModule::remove(Interface *i)
214 215
215void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces) 216void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces)
216{ 217{
217 newIfaces.insert(QObject::tr("PPP") , 218 newIfaces.insert(::QObject::tr("PPP") ,
218 QObject::tr("generic ppp device")); 219 ::QObject::tr("generic ppp device"));
219} 220}
220 221
221 222