summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-09 18:10:11 (UTC)
committer kergoth <kergoth>2003-04-09 18:10:11 (UTC)
commitbacff63f1e4915c683a409e81b18ffcf5aeceda3 (patch) (unidiff)
treea1b898223bd132a29964ec28a89c0756fa9828cf
parentdc219288ae070e0fe91e2d7da768d620f8b91592 (diff)
downloadopie-bacff63f1e4915c683a409e81b18ffcf5aeceda3.zip
opie-bacff63f1e4915c683a409e81b18ffcf5aeceda3.tar.gz
opie-bacff63f1e4915c683a409e81b18ffcf5aeceda3.tar.bz2
Make networksettings actually compile again. Fix the ifdef on non-kde to actually work, and killed off more references to qt3 widget flags.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp2
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp20
-rw-r--r--noncore/settings/networksettings/mainwindowimp.h4
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp2
4 files changed, 14 insertions, 14 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
index 15293fd..e00dcce 100644
--- a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
@@ -1,17 +1,17 @@
1#include "interfaceinformationimp.h" 1#include "interfaceinformationimp.h"
2#include "interfaceadvanced.h" 2#include "interfaceadvanced.h"
3 3
4#include <qpushbutton.h> 4#include <qpushbutton.h>
5#include <qlabel.h> 5#include <qlabel.h>
6#include <qgroupbox.h> 6#include <qgroupbox.h>
7#include <qmessagebox.h> 7#include <qmessagebox.h>
8 8
9#ifdef QTE_VERSION 9#ifdef QWS
10#else 10#else
11 #define showMaximized show 11 #define showMaximized show
12#endif 12#endif
13 13
14/** 14/**
15 * Constructor for the InterfaceInformationImp class. This class pretty much 15 * Constructor for the InterfaceInformationImp class. This class pretty much
16 * just display's information about the interface that is passed to it. 16 * just display's information about the interface that is passed to it.
17 */ 17 */
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index d6b708b..581b7e3 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -9,22 +9,22 @@
9#include <qlistbox.h> 9#include <qlistbox.h>
10#include <qlineedit.h> 10#include <qlineedit.h>
11#include <qlistview.h> 11#include <qlistview.h>
12#include <qheader.h> 12#include <qheader.h>
13#include <qlabel.h> 13#include <qlabel.h>
14 14
15#include <qmessagebox.h> 15#include <qmessagebox.h>
16 16
17#ifdef QTE_VERSION 17#ifdef QWS
18 #include <qpe/config.h> 18 #include <qpe/config.h>
19 #include <qpe/qlibrary.h> 19 #include <qpe/qlibrary.h>
20 #include <qpe/resource.h> 20 #include <qpe/resource.h>
21 #include <qpe/qpeapplication.h> 21 #include <qpe/qpeapplication.h>
22 #define QLibrary 22// #define QLibrary Library
23#else 23#else
24 #include <klibloader.h> 24 #include <klibloader.h>
25 #define QLibrary KLibrary 25 #define QLibrary KLibrary
26 #include <kconfig.h> 26 #include <kconfig.h>
27 #define Config KConfig 27 #define Config KConfig
28 #include <kapplication.h> 28 #include <kapplication.h>
29 #include <kstandarddirs.h> 29 #include <kstandarddirs.h>
30 #include <kiconloader.h> 30 #include <kiconloader.h>
@@ -54,18 +54,18 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
54 54
55 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); 55 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
56 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); 56 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));
57 connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile())); 57 connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile()));
58 58
59 connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); 59 connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&)));
60 // Load connections. 60 // Load connections.
61 // /usr/local/kde/lib/libinterfaces.la 61 // /usr/local/kde/lib/libinterfaces.la
62#ifdef QTE_VERSION 62#ifdef QWS
63 loadModules(QPEApplication::kdeDir() + "/plugins/networksettings"); 63 loadModules(QPEApplication::qpeDir() + "/plugins/networksettings");
64#else 64#else
65 loader = KLibLoader::self(); 65 loader = KLibLoader::self();
66 loadModules(QString("/usr/")+KStandardDirs::kde_default("lib")); 66 loadModules(QString("/usr/")+KStandardDirs::kde_default("lib"));
67#endif 67#endif
68 getAllInterfaces(); 68 getAllInterfaces();
69 69
70 Interfaces i; 70 Interfaces i;
71 QStringList list = i.getInterfaceList(); 71 QStringList list = i.getInterfaceList();
@@ -125,17 +125,17 @@ MainWindowImp::~MainWindowImp(){
125 125
126 // Delete all interfaces that don't have owners. 126 // Delete all interfaces that don't have owners.
127 QMap<Interface*, QListViewItem*>::Iterator iIt; 127 QMap<Interface*, QListViewItem*>::Iterator iIt;
128 for( iIt = items.begin(); iIt != items.end(); ++iIt ){ 128 for( iIt = items.begin(); iIt != items.end(); ++iIt ){
129 if(iIt.key()->getModuleOwner() == NULL) 129 if(iIt.key()->getModuleOwner() == NULL)
130 delete iIt.key(); 130 delete iIt.key();
131 } 131 }
132 132
133#ifdef QTE_VERSION 133#ifdef QWS
134 // Delete Modules and Libraries 134 // Delete Modules and Libraries
135 QMap<Module*, QLibrary*>::Iterator it; 135 QMap<Module*, QLibrary*>::Iterator it;
136 for( it = libraries.begin(); it != libraries.end(); ++it ){ 136 for( it = libraries.begin(); it != libraries.end(); ++it ){
137 delete it.key(); 137 delete it.key();
138 // I wonder why I can't delete the libraries 138 // I wonder why I can't delete the libraries
139 // What fucking shit this is. 139 // What fucking shit this is.
140 //delete it.data(); 140 //delete it.data();
141 } 141 }
@@ -241,17 +241,17 @@ void MainWindowImp::loadModules(const QString &path){
241 * @param pluginFileName - the name of the file in which to attempt to load 241 * @param pluginFileName - the name of the file in which to attempt to load
242 * @param resolveString - function pointer to resolve 242 * @param resolveString - function pointer to resolve
243 * @return pointer to the function with name resolveString or NULL 243 * @return pointer to the function with name resolveString or NULL
244 */ 244 */
245Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){ 245Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){
246#ifdef DEBUG 246#ifdef DEBUG
247 qDebug("MainWindowImp::loadPlugin: %s", pluginFileName.latin1()); 247 qDebug("MainWindowImp::loadPlugin: %s", pluginFileName.latin1());
248#endif 248#endif
249#ifdef QTE_VERSION 249#ifdef QWS
250 QLibrary *lib = new QLibrary(pluginFileName); 250 QLibrary *lib = new QLibrary(pluginFileName);
251 void *functionPointer = lib->resolve(resolveString); 251 void *functionPointer = lib->resolve(resolveString);
252 if( !functionPointer ){ 252 if( !functionPointer ){
253#ifdef DEBUG 253#ifdef DEBUG
254 qDebug("MainWindowImp::loadPlugin: File: %s is not a plugin, but though was.", pluginFileName.latin1()); 254 qDebug("MainWindowImp::loadPlugin: File: %s is not a plugin, but though was.", pluginFileName.latin1());
255#endif 255#endif
256 delete lib; 256 delete lib;
257 return NULL; 257 return NULL;
@@ -377,17 +377,17 @@ void MainWindowImp::configureClicked(){
377 if(i->getModuleOwner()){ 377 if(i->getModuleOwner()){
378 QWidget *moduleConfigure = i->getModuleOwner()->configure(i); 378 QWidget *moduleConfigure = i->getModuleOwner()->configure(i);
379 if(moduleConfigure != NULL){ 379 if(moduleConfigure != NULL){
380 moduleConfigure->showMaximized(); 380 moduleConfigure->showMaximized();
381 return; 381 return;
382 } 382 }
383 } 383 }
384 384
385 InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog); 385 InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);
386 QString currentProfileText = currentProfileLabel->text(); 386 QString currentProfileText = currentProfileLabel->text();
387 if(currentProfileText.upper() == "ALL"); 387 if(currentProfileText.upper() == "ALL");
388 currentProfileText = ""; 388 currentProfileText = "";
389 configure->setProfile(currentProfileText); 389 configure->setProfile(currentProfileText);
390 configure->showMaximized(); 390 configure->showMaximized();
391} 391}
392 392
393/** 393/**
@@ -413,17 +413,17 @@ void MainWindowImp::informationClicked(){
413 if(moduleInformation != NULL){ 413 if(moduleInformation != NULL){
414 moduleInformation->showMaximized(); 414 moduleInformation->showMaximized();
415#ifdef DEBUG 415#ifdef DEBUG
416 qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed."); 416 qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed.");
417#endif 417#endif
418 return; 418 return;
419 } 419 }
420 } 420 }
421 InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog); 421 InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);
422 information->showMaximized(); 422 information->showMaximized();
423} 423}
424 424
425/** 425/**
426 * Update this interface. If no QListViewItem exists create one. 426 * Update this interface. If no QListViewItem exists create one.
427 * @param Interface* pointer to the interface that needs to be updated. 427 * @param Interface* pointer to the interface that needs to be updated.
428 */ 428 */
429void MainWindowImp::updateInterface(Interface *i){ 429void MainWindowImp::updateInterface(Interface *i){
@@ -445,17 +445,17 @@ void MainWindowImp::updateInterface(Interface *i){
445 } 445 }
446 items.insert(i, item); 446 items.insert(i, item);
447 interfaceItems.insert(item, i); 447 interfaceItems.insert(item, i);
448 } 448 }
449 else 449 else
450 item = items[i]; 450 item = items[i];
451 451
452 // Update the icons and information 452 // Update the icons and information
453#ifdef QTE_VERSION 453#ifdef QWS
454 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down"))); 454 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));
455#else 455#else
456 item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down"))); 456 item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down")));
457#endif 457#endif
458 458
459 QString typeName = "lan"; 459 QString typeName = "lan";
460 if(i->getHardwareName().contains("Local Loopback")) 460 if(i->getHardwareName().contains("Local Loopback"))
461 typeName = "lo"; 461 typeName = "lo";
@@ -467,17 +467,17 @@ void MainWindowImp::updateInterface(Interface *i){
467 typeName = "usb"; 467 typeName = "usb";
468 468
469 if(!i->isAttached()) 469 if(!i->isAttached())
470 typeName = "connect_no"; 470 typeName = "connect_no";
471 // Actually try to use the Module 471 // Actually try to use the Module
472 if(i->getModuleOwner() != NULL) 472 if(i->getModuleOwner() != NULL)
473 typeName = i->getModuleOwner()->getPixmapName(i); 473 typeName = i->getModuleOwner()->getPixmapName(i);
474 474
475#ifdef QTE_VERSION 475#ifdef QWS
476 item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName))); 476 item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName)));
477#else 477#else
478 item->setPixmap(1, (SmallIcon(typeName))); 478 item->setPixmap(1, (SmallIcon(typeName)));
479#endif 479#endif
480 item->setText(2, i->getHardwareName()); 480 item->setText(2, i->getHardwareName());
481 item->setText(3, QString("(%1)").arg(i->getInterfaceName())); 481 item->setText(3, QString("(%1)").arg(i->getInterfaceName()));
482 item->setText(4, (i->getStatus()) ? i->getIp() : QString("")); 482 item->setText(4, (i->getStatus()) ? i->getIp() : QString(""));
483} 483}
diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h
index 2ebf304..49f3eea 100644
--- a/noncore/settings/networksettings/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindowimp.h
@@ -4,17 +4,17 @@
4#include "mainwindow.h" 4#include "mainwindow.h"
5#include <qmap.h> 5#include <qmap.h>
6#include <qstringlist.h> 6#include <qstringlist.h>
7 7
8class Module; 8class Module;
9class Interface; 9class Interface;
10class QLibrary; 10class QLibrary;
11class KProcess; 11class KProcess;
12#ifdef QTE_VERSION 12#ifdef QWS
13class QLibrary; 13class QLibrary;
14#else 14#else
15class KLibrary; 15class KLibrary;
16class KLibLoader; 16class KLibLoader;
17#define QLibrary KLibrary 17#define QLibrary KLibrary
18#endif 18#endif
19 19
20 20
@@ -53,17 +53,17 @@ private:
53 QMap<Interface*, QListViewItem*> items; 53 QMap<Interface*, QListViewItem*> items;
54 QMap<QListViewItem*, Interface*> interfaceItems; 54 QMap<QListViewItem*, Interface*> interfaceItems;
55 55
56 QMap<KProcess*, QString> threads; 56 QMap<KProcess*, QString> threads;
57 QStringList profiles; 57 QStringList profiles;
58 58
59 bool advancedUserMode; 59 bool advancedUserMode;
60 QString scheme; 60 QString scheme;
61#ifndef QTE_VERSION 61#ifndef QWS
62 KLibLoader *loader; 62 KLibLoader *loader;
63#endif 63#endif
64}; 64};
65 65
66#endif 66#endif
67 67
68// mainwindowimp.h 68// mainwindowimp.h
69 69
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 57266bb..8bf004f 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -8,17 +8,17 @@
8#include <qlineedit.h> 8#include <qlineedit.h>
9#include <qlabel.h> 9#include <qlabel.h>
10#include <qspinbox.h> 10#include <qspinbox.h>
11#include <qradiobutton.h> 11#include <qradiobutton.h>
12#include <qcheckbox.h> 12#include <qcheckbox.h>
13#include <qtabwidget.h> 13#include <qtabwidget.h>
14#include <qcombobox.h> 14#include <qcombobox.h>
15 15
16#ifdef QTE_VERSION 16#ifdef QWS
17 #include <opie/oprocess.h> 17 #include <opie/oprocess.h>
18#else 18#else
19 #define OProcess KProcess 19 #define OProcess KProcess
20 #include <kprocess.h> 20 #include <kprocess.h>
21#endif 21#endif
22 22
23#define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" 23#define WIRELESS_OPTS "/etc/pcmcia/wireless.opts"
24 24