summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/mainwindow/mainwindowimp.cpp48
1 files changed, 21 insertions, 27 deletions
diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
index 5184630..a4a2875 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
@@ -50,14 +50,8 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi
connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked()));
- connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
- connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));
- connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile()));
-
- connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&)));
-
- //FIXME: disable profiles for the moment:
- tabWidget->setTabEnabled( tab, false );
+ //remove tab with no function
+ tabWidget->removePage( tab );
// Load connections.
// /usr/local/kde/lib/libinterfaces.la
@@ -80,7 +74,7 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi
*/
if (m_handledIfaces.contains( *ni) )
{
- odebug << "Not up iface handled by module" << oendl;
+ odebug << "Not up iface handled by module" << oendl;
continue;
}
bool found = false;
@@ -220,7 +214,7 @@ void MainWindowImp::getAllInterfaces()
int flags = 0;
if ( m_handledIfaces.contains( (*it) ) )
{
- odebug << " " << (*it).latin1() << " is handled by a module" << oendl;
+ odebug << " " << (*it).latin1() << " is handled by a module" << oendl;
continue;
}
// int family;
@@ -250,7 +244,7 @@ void MainWindowImp::getAllInterfaces()
else
i->setHardwareName("Unknown");
- owarn << "Adding interface " << ifr.ifr_name << " to interfaceNames\n" << oendl;
+ owarn << "Adding interface " << ifr.ifr_name << " to interfaceNames\n" << oendl;
interfaceNames.insert(i->getInterfaceName(), i);
updateInterface(i);
connect(i, SIGNAL(updateInterface(Interface*)),
@@ -266,7 +260,7 @@ void MainWindowImp::getAllInterfaces()
ilist = it.key()->getInterfaces();
for( i = ilist.first(); i != 0; i = ilist.next() )
{
- owarn << "Adding interface " << i->getInterfaceName().latin1() << " to interfaceNames\n" << oendl;
+ owarn << "Adding interface " << i->getInterfaceName().latin1() << " to interfaceNames\n" << oendl;
interfaceNames.insert(i->getInterfaceName(), i);
updateInterface(i);
connect(i, SIGNAL(updateInterface(Interface*)),
@@ -284,7 +278,7 @@ void MainWindowImp::getAllInterfaces()
void MainWindowImp::loadModules(const QString &path)
{
#ifdef DEBUG
- odebug << "MainWindowImp::loadModules: " << path.latin1() << "" << oendl;
+ odebug << "MainWindowImp::loadModules: " << path.latin1() << "" << oendl;
#endif
QDir d(path);
if(!d.exists())
@@ -305,7 +299,7 @@ void MainWindowImp::loadModules(const QString &path)
{
#endif
loadPlugin(path + "/" + fi->fileName());
- odebug << "loaded plugin: >" << QString(path + "/" + fi->fileName()).latin1() << "< " << oendl;
+ odebug << "loaded plugin: >" << QString(path + "/" + fi->fileName()).latin1() << "< " << oendl;
}
++it;
}
@@ -320,7 +314,7 @@ void MainWindowImp::loadModules(const QString &path)
Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString)
{
#ifdef DEBUG
- odebug << "MainWindowImp::loadPlugin: " << pluginFileName.latin1() << ": resolving " << resolveString.latin1() << "" << oendl;
+ odebug << "MainWindowImp::loadPlugin: " << pluginFileName.latin1() << ": resolving " << resolveString.latin1() << "" << oendl;
#endif
#ifdef QWS
QLibrary *lib = new QLibrary(pluginFileName);
@@ -328,7 +322,7 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
if( !functionPointer )
{
#ifdef DEBUG
- odebug << "MainWindowImp::loadPlugin: Warning: " << pluginFileName.latin1() << " is not a plugin" << oendl;
+ odebug << "MainWindowImp::loadPlugin: Warning: " << pluginFileName.latin1() << " is not a plugin" << oendl;
#endif
delete lib;
return NULL;
@@ -338,7 +332,7 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
if(object == NULL)
{
#ifdef DEBUG
- odebug << "MainWindowImp: Couldn't create object, but did load library!" << oendl;
+ odebug << "MainWindowImp: Couldn't create object, but did load library!" << oendl;
#endif
delete lib;
return NULL;
@@ -353,7 +347,7 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
QLibrary *lib = loader->library(pluginFileName);
if( !lib || !lib->hasSymbol(resolveString) )
{
- odebug << QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1() << oendl;
+ odebug << QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1() << oendl;
return NULL;
}
// Try to get an object.
@@ -361,12 +355,12 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
if(object == NULL)
{
#ifdef DEBUG
- odebug << "MainWindowImp: Couldn't create object, but did load library!" << oendl;
+ odebug << "MainWindowImp: Couldn't create object, but did load library!" << oendl;
#endif
return NULL;
}
#ifdef DEBUG
- odebug << "MainWindowImp::loadPlugin:: Found object, storing." << oendl;
+ odebug << "MainWindowImp::loadPlugin:: Found object, storing." << oendl;
#endif
// Store for deletion later
libraries.insert(object, lib);
@@ -412,7 +406,7 @@ void MainWindowImp::addClicked()
Interface *i = (it.key())->addNewInterface(item->text(0));
if(i)
{
- odebug << "iface name " << i->getInterfaceName().latin1() << "" << oendl;
+ odebug << "iface name " << i->getInterfaceName().latin1() << "" << oendl;
interfaceNames.insert(i->getInterfaceName(), i);
updateInterface(i);
}
@@ -514,7 +508,7 @@ void MainWindowImp::informationClicked()
{
QPEApplication::showWidget( moduleInformation );
#ifdef DEBUG
- odebug << "MainWindowImp::informationClicked:: Module owner has created, we showed." << oendl;
+ odebug << "MainWindowImp::informationClicked:: Module owner has created, we showed." << oendl;
#endif
return;
}
@@ -651,7 +645,7 @@ void MainWindowImp::removeProfile()
for( it = items.begin(); it != items.end(); ++it )
{
QString interfaceName = it.key()->getInterfaceName();
- odebug << interfaceName.latin1() << oendl;
+ odebug << interfaceName.latin1() << oendl;
if(interfaces.setInterface(interfaceName + "_" + profileToRemove))
{
interfaces.removeInterface();
@@ -720,7 +714,7 @@ void MainWindowImp::makeChannel()
void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
{
bool found = false;
- odebug << "MainWindowImp::receive QCop msg >"+msg+"<" << oendl;
+ odebug << "MainWindowImp::receive QCop msg >"+msg+"<" << oendl;
if (msg == "raise")
{
raise();
@@ -730,12 +724,12 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
QString dest = msg.left(msg.find("("));
QCString param = msg.right(msg.length() - msg.find("(") - 1);
param = param.left( param.length() - 1 );
- odebug << "dest >" << dest.latin1() << "< param >"+param+"<" << oendl;
+ odebug << "dest >" << dest.latin1() << "< param >"+param+"<" << oendl;
QMap<Module*, QLibrary*>::Iterator it;
for( it = libraries.begin(); it != libraries.end(); ++it )
{
- odebug << "plugin >" << it.key()->type().latin1() << "<" << oendl;
+ odebug << "plugin >" << it.key()->type().latin1() << "<" << oendl;
if(it.key()->type() == dest)
{
it.key()->receive( param, arg );
@@ -745,5 +739,5 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
if (found) QPEApplication::setKeepRunning();
- else odebug << "Huh what do ya want" << oendl;
+ else odebug << "Huh what do ya want" << oendl;
}