summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-24 15:05:23 (UTC)
committer mickeyl <mickeyl>2004-04-24 15:05:23 (UTC)
commit2b700fa535661eb1ac897797f318a2694397a4d6 (patch) (side-by-side diff)
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) (ignore 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
@@ -8,16 +8,17 @@
/* OPIE */
#include <opie2/odebug.h>
#include <qpe/config.h>
#include <qpe/qpeapplication.h>
using namespace Opie::Core;
/* QT */
+#include <qt.h>
/* STD */
#include <errno.h>
#include <signal.h>
// don't polute global namespace
namespace
{
@@ -141,17 +142,17 @@ bool PPPModule::isOwner(Interface *i)
* Create, and return the WLANConfigure Module
* @return QWidget* pointer to this modules configure.
*/
QWidget *PPPModule::configure(Interface *i)
{
odebug << "return ModemWidget" << oendl;
PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i,
0, "PPPConfig", false,
- (Qt::WDestructiveClose | Qt::WStyle_ContextHelp));
+ ::Qt::WDestructiveClose | ::Qt::WStyle_ContextHelp);
return pppconfig;
}
/**
* Create, and return the Information Module
* @return QWidget* pointer to this modules info.
*/
QWidget *PPPModule::information(Interface *i)
@@ -209,18 +210,18 @@ Interface *PPPModule::addNewInterface(const QString &newInterface)
*/
bool PPPModule::remove(Interface *i)
{
return list.remove(i);
}
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"));
}
namespace
{
InterfaceKeeper::InterfaceKeeper( )
{}