From 2b700fa535661eb1ac897797f318a2694397a4d6 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Sat, 24 Apr 2004 15:05:23 +0000 Subject: 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::...) --- 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 @@ using namespace Opie::Core; /* QT */ +#include /* STD */ #include @@ -146,7 +147,7 @@ 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; } @@ -214,8 +215,8 @@ bool PPPModule::remove(Interface *i) void PPPModule::possibleNewInterfaces(QMap &newIfaces) { - newIfaces.insert(QObject::tr("PPP") , - QObject::tr("generic ppp device")); + newIfaces.insert(::QObject::tr("PPP") , + ::QObject::tr("generic ppp device")); } -- cgit v0.9.0.2