author | zecke <zecke> | 2004-03-13 22:41:59 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 22:41:59 (UTC) |
commit | 3d27828732fe7e499219ad6e208dc13dead86431 (patch) (side-by-side diff) | |
tree | faa42dec364ad1e0470a370c81d0a7dc0cd2f9bc /noncore/apps/opie-console | |
parent | ee753c0009da5bec4a71d3263e9623d04dddc5c4 (diff) | |
download | opie-3d27828732fe7e499219ad6e208dc13dead86431.zip opie-3d27828732fe7e499219ad6e208dc13dead86431.tar.gz opie-3d27828732fe7e499219ad6e208dc13dead86431.tar.bz2 |
Namespace changes for Apps
QAshMoney and Reader need to be valgrinded
-rw-r--r-- | noncore/apps/opie-console/io_bt.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_bt.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_irda.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_irda.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_modem.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileeditordialog.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileeditordialog.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/sz_transfer.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/opie-console/sz_transfer.h | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/tabwidget.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/tabwidget.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/test/senderui.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/test/senderui.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/transferdialog.cpp | 3 |
16 files changed, 34 insertions, 20 deletions
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp index 1a8c979..35a328f 100644 --- a/noncore/apps/opie-console/io_bt.cpp +++ b/noncore/apps/opie-console/io_bt.cpp @@ -3,2 +3,4 @@ +using namespace Opie::Core; +using namespace Opie::Core; IOBt::IOBt( const Profile &config ) : IOSerial( config ) { @@ -38,3 +40,3 @@ bool IOBt::open() { - connect( m_attach, SIGNAL( processExited(OProcess*) ), + connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), this, SLOT( slotExited(OProcess*) ) ); diff --git a/noncore/apps/opie-console/io_bt.h b/noncore/apps/opie-console/io_bt.h index df6dd38..00ca7e5 100644 --- a/noncore/apps/opie-console/io_bt.h +++ b/noncore/apps/opie-console/io_bt.h @@ -43,6 +43,6 @@ public slots: private: - OProcess *m_attach; + Opie::Core::OProcess *m_attach; QString m_mac; private slots: - void slotExited(OProcess* proc); + void slotExited(Opie::Core::OProcess* proc); diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp index b281b7d..ba0b0e5 100644 --- a/noncore/apps/opie-console/io_irda.cpp +++ b/noncore/apps/opie-console/io_irda.cpp @@ -3,2 +3,4 @@ +using namespace Opie::Core; +using namespace Opie::Core; IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) { @@ -29,3 +31,3 @@ bool IOIrda::open() { - connect( m_attach, SIGNAL( processExited(OProcess*) ), + connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), this, SLOT( slotExited(OProcess*) ) ); diff --git a/noncore/apps/opie-console/io_irda.h b/noncore/apps/opie-console/io_irda.h index 69bed7d..fb29686 100644 --- a/noncore/apps/opie-console/io_irda.h +++ b/noncore/apps/opie-console/io_irda.h @@ -41,6 +41,6 @@ public slots: private: - OProcess *m_attach; + Opie::Core::OProcess *m_attach; private slots: - void slotExited(OProcess* proc); + void slotExited(Opie::Core::OProcess* proc); diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp index 1ce680a..b74d076 100644 --- a/noncore/apps/opie-console/io_modem.cpp +++ b/noncore/apps/opie-console/io_modem.cpp @@ -5,2 +5,4 @@ +using namespace Opie::Core; +using namespace Opie::Core; IOModem::IOModem( const Profile &profile ) diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h index 96ec3ef..5b99e00 100644 --- a/noncore/apps/opie-console/io_modem.h +++ b/noncore/apps/opie-console/io_modem.h @@ -69,3 +69,3 @@ private: private slots: - void slotExited(OProcess* proc); + void slotExited(Opie::Core::OProcess* proc); diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 197f799..06a8f7d 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp @@ -26,2 +26,3 @@ +using namespace Opie::Ui; MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) { @@ -334,3 +335,3 @@ void MainWindow::slotSaveScript() { map.insert(tr("Script"), text ); - QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map); + QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map); if (!filename.isEmpty()) { @@ -707,3 +708,3 @@ void MainWindow::slotSaveHistory() { map.insert(tr("History"), text ); - QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map); + QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map); if (filename.isEmpty() ) return; diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp index 6e1e23e..dc42d8b 100644 --- a/noncore/apps/opie-console/profileeditordialog.cpp +++ b/noncore/apps/opie-console/profileeditordialog.cpp @@ -11,2 +11,3 @@ +using namespace Opie::Ui; namespace { diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h index 97bd650..e7a88e9 100644 --- a/noncore/apps/opie-console/profileeditordialog.h +++ b/noncore/apps/opie-console/profileeditordialog.h @@ -55,3 +55,3 @@ private: QHBoxLayout *m_layCon, *m_layTerm, *m_layKey; - OTabWidget *tabWidget; + Opie::Ui::OTabWidget *tabWidget; QWidget *tabprof; diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp index 2f82417..5958e93 100644 --- a/noncore/apps/opie-console/sz_transfer.cpp +++ b/noncore/apps/opie-console/sz_transfer.cpp @@ -8,2 +8,4 @@ +using namespace Opie::Core; +using namespace Opie::Core; SzTransfer::SzTransfer(Type t, IOLayer *layer) : FileTransferLayer(layer), m_t(t) @@ -27,7 +29,7 @@ void SzTransfer::sendFile(const QString& file) { *proc << "-v" << "-v" << "-b" << file; - connect(proc, SIGNAL(processExited(OProcess*)), + connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), this, SLOT(sent())); - connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)), + connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), this, SLOT(SzReceivedStdout(OProcess*,char*,int))); - connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)), + connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT(SzReceivedStderr(OProcess*,char*,int))); diff --git a/noncore/apps/opie-console/sz_transfer.h b/noncore/apps/opie-console/sz_transfer.h index aa97c32..0505215 100644 --- a/noncore/apps/opie-console/sz_transfer.h +++ b/noncore/apps/opie-console/sz_transfer.h @@ -29,4 +29,4 @@ public slots: private slots: - void SzReceivedStdout(OProcess *, char *, int); - void SzReceivedStderr(OProcess *, char *, int); + void SzReceivedStdout(Opie::Core::OProcess *, char *, int); + void SzReceivedStderr(Opie::Core::OProcess *, char *, int); void receivedStdin(const QByteArray &); @@ -34,3 +34,3 @@ private slots: private: - OProcess *proc; + Opie::Core::OProcess *proc; Type m_t; diff --git a/noncore/apps/opie-console/tabwidget.cpp b/noncore/apps/opie-console/tabwidget.cpp index 419f8ac..6429e3c 100644 --- a/noncore/apps/opie-console/tabwidget.cpp +++ b/noncore/apps/opie-console/tabwidget.cpp @@ -3,2 +3,3 @@ +using namespace Opie::Ui; TabWidget::TabWidget( QWidget* parent, const char* name ) diff --git a/noncore/apps/opie-console/tabwidget.h b/noncore/apps/opie-console/tabwidget.h index 98450a3..0138645 100644 --- a/noncore/apps/opie-console/tabwidget.h +++ b/noncore/apps/opie-console/tabwidget.h @@ -11,3 +11,3 @@ */ -class TabWidget : public OTabWidget{ +class TabWidget : public Opie::Ui::OTabWidget{ Q_OBJECT diff --git a/noncore/apps/opie-console/test/senderui.cpp b/noncore/apps/opie-console/test/senderui.cpp index b1725db..df27055 100644 --- a/noncore/apps/opie-console/test/senderui.cpp +++ b/noncore/apps/opie-console/test/senderui.cpp @@ -17,2 +17,4 @@ +using namespace Opie::Core; +using namespace Opie::Core; SenderUI::SenderUI() diff --git a/noncore/apps/opie-console/test/senderui.h b/noncore/apps/opie-console/test/senderui.h index c130dcf..15f0743 100644 --- a/noncore/apps/opie-console/test/senderui.h +++ b/noncore/apps/opie-console/test/senderui.h @@ -10,3 +10,3 @@ class FileTransfer; class QSocketNotifier; -class OProcess; +namespace Opie {namespace Core {class Opie::Core::OProcess;}} class SenderUI : public Sender { @@ -29,3 +29,3 @@ private: QSocketNotifier* m_sock; - OProcess* m_proc; + Opie::Core::OProcess* m_proc; }; diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp index d494a6c..75eb443 100644 --- a/noncore/apps/opie-console/transferdialog.cpp +++ b/noncore/apps/opie-console/transferdialog.cpp @@ -17,2 +17,3 @@ +using namespace Opie::Ui; TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *) @@ -100,3 +101,3 @@ void TransferDialog::slotFilename() - f = Opie::OFileDialog::getOpenFileName(0); + f = OFileDialog::getOpenFileName(0); if(!f.isNull()) filename->setText(f); |