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 @@ -1,31 +1,32 @@ #include "modem.h" #include "pppconfig.h" #include "pppmodule.h" #include "pppdata.h" #include "interfaceinformationppp.h" #include "interfaceppp.h" /* 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 { /* * If network settings is qutting and we've ppp * devices open we need to save the pid_t the PPData * and the interface number */ struct Connection { pid_t pid; @@ -133,33 +134,33 @@ QString PPPModule::getPixmapName(Interface* ) * @return bool true if i is owned by this module, false otherwise. */ bool PPPModule::isOwner(Interface *i) { return list.find( i ) != -1; } /** * 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) { // We don't have any advanced pppd information widget yet :-D // TODO ^ return new InterfaceInformationPPP( 0, "InterfaceInformationPPP", i ); } /** @@ -201,34 +202,34 @@ Interface *PPPModule::addNewInterface(const QString &newInterface) iface = NULL; } return iface; } /** * Attempts to remove the interface, doesn't delete i * @return bool true if successful, false otherwise. */ 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( ) {} InterfaceKeeper::~InterfaceKeeper() { Config cfg("ppp_plugin_keeper"); QStringList lst = cfg.groupList(); for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { Connection con; cfg.setGroup( (*it) ); |