-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/aqpkg/ipkg.h | 8 | ||||
-rw-r--r-- | noncore/settings/aqpkg/main.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/aqpkg/settingsimpl.cpp | 4 |
5 files changed, 14 insertions, 9 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp index d2babb4..da21cef 100644 --- a/noncore/settings/aqpkg/installdlgimpl.cpp +++ b/noncore/settings/aqpkg/installdlgimpl.cpp @@ -56,8 +56,9 @@ #include "ipkg.h" #include "utils.h" #include "global.h" +using namespace Opie::Ui; enum { MAXLINES = 100, }; @@ -232,9 +233,9 @@ void InstallDlgImpl :: optionsSelected() map.insert(tr( "Text" ), text ); text << "*"; map.insert( tr( "All" ), text ); - QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); + QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); if( !filename.isEmpty() ) { QString currentFileName = QFileInfo( filename ).fileName(); DocLnk doc; diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 866afed..0091a3b 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp @@ -41,8 +41,9 @@ #include "utils.h" #include "ipkg.h" #include "global.h" +using namespace Opie::Core; Ipkg :: Ipkg() { proc = 0; } @@ -287,15 +288,15 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) aborted = false; // Connect up our slots - connect(proc, SIGNAL(processExited(OProcess*)), + connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), this, SLOT( processFinished())); - connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)), + connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), this, SLOT(commandStdout(OProcess*,char*,int))); - connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)), + connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT(commandStderr(OProcess*,char*,int))); for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it ) { diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h index f892038..e216d17 100644 --- a/noncore/settings/aqpkg/ipkg.h +++ b/noncore/settings/aqpkg/ipkg.h @@ -46,9 +46,9 @@ #define FORCE_OVERWRITE 0x0008 #define MAKE_LINKS 0x0010 #define VERBOSE_WGET 0x0020 -class OProcess; +namespace Opie {namespace Core {class OProcess;}} class Ipkg : public QObject { Q_OBJECT @@ -69,10 +69,10 @@ signals: void outputText( const QString &text ); void ipkgFinished(); public slots: - void commandStdout(OProcess*, char *buffer, int buflen); - void commandStderr(OProcess*, char *buffer, int buflen); + void commandStdout(Opie::Core::OProcess*, char *buffer, int buflen); + void commandStderr(Opie::Core::OProcess*, char *buffer, int buflen); void processFinished(); void abort(); @@ -84,9 +84,9 @@ private: QString package; QString destination; QString destDir; QString runtimeDir; - OProcess *proc; + Opie::Core::OProcess *proc; int flags; int infoLevel; bool finished; diff --git a/noncore/settings/aqpkg/main.cpp b/noncore/settings/aqpkg/main.cpp index b391714..d27479c 100644 --- a/noncore/settings/aqpkg/main.cpp +++ b/noncore/settings/aqpkg/main.cpp @@ -34,5 +34,6 @@ /* be less intrusive for translation -zecke */ extern QString LOCAL_SERVER; extern QString LOCAL_IPKGS; +using namespace Opie::Core; OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp index b9dbb6e..2f35617 100644 --- a/noncore/settings/aqpkg/settingsimpl.cpp +++ b/noncore/settings/aqpkg/settingsimpl.cpp @@ -51,8 +51,10 @@ #include <fstream> #include <algorithm> using namespace std; +using namespace Opie::Ui; +using namespace Opie::Ui; SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { setCaption( tr( "Configuration" ) ); @@ -62,9 +64,9 @@ SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const layout->setMargin( 2 ); layout->setSpacing( 4 ); // Setup tabs for all info - Opie::OTabWidget *tabwidget = new Opie::OTabWidget( this ); + OTabWidget *tabwidget = new OTabWidget( this ); layout->addWidget( tabwidget ); tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) ); tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) ); |