-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 @@ -2,4 +2,6 @@ #include "io_bt.h" +using namespace Opie::Core; +using namespace Opie::Core; IOBt::IOBt( const Profile &config ) : IOSerial( config ) { m_attach = 0; @@ -37,5 +39,5 @@ bool IOBt::open() { // then start hcid, then rcfomm handling (m_mac) - 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 @@ -42,8 +42,8 @@ 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 @@ -2,4 +2,6 @@ #include "io_irda.h" +using namespace Opie::Core; +using namespace Opie::Core; IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) { m_attach = 0; @@ -28,5 +30,5 @@ bool IOIrda::open() { *m_attach << "irattach /dev/ttyS2 -s"; - 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 @@ -40,8 +40,8 @@ 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 @@ -4,4 +4,6 @@ #include "dialer.h" +using namespace Opie::Core; +using namespace Opie::Core; IOModem::IOModem( const Profile &profile ) : IOSerial( 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 @@ -68,5 +68,5 @@ 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 @@ -25,4 +25,5 @@ +using namespace Opie::Ui; MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) { KeyTrans::loadAll(); @@ -333,5 +334,5 @@ void MainWindow::slotSaveScript() { text << "text/plain"; 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()) { QFileInfo info(filename); @@ -706,5 +707,5 @@ void MainWindow::slotSaveHistory() { text << "text/plain"; 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 @@ -10,4 +10,5 @@ #include "profileeditordialog.h" +using namespace Opie::Ui; namespace { void setCurrent( const QString& str, QComboBox* bo ) { 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 @@ -54,5 +54,5 @@ private: ProfileDialogWidget* m_con, *m_term, *m_key; QHBoxLayout *m_layCon, *m_layTerm, *m_layKey; - OTabWidget *tabWidget; + Opie::Ui::OTabWidget *tabWidget; QWidget *tabprof; int m_showconntab; 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 @@ -7,4 +7,6 @@ +using namespace Opie::Core; +using namespace Opie::Core; SzTransfer::SzTransfer(Type t, IOLayer *layer) : FileTransferLayer(layer), m_t(t) { @@ -26,9 +28,9 @@ void SzTransfer::sendFile(const QString& file) { *proc << "sz"; *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))); connect(layer(), SIGNAL(received(const QByteArray&)), 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 @@ -28,10 +28,10 @@ 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 &); 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 @@ -2,4 +2,5 @@ #include "tabwidget.h" +using namespace Opie::Ui; TabWidget::TabWidget( QWidget* parent, const char* name ) : OTabWidget( parent, 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 @@ -10,5 +10,5 @@ * we can add sessions here */ -class TabWidget : public OTabWidget{ +class TabWidget : public Opie::Ui::OTabWidget{ Q_OBJECT public: 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 @@ -16,4 +16,6 @@ #include "senderui.h" +using namespace Opie::Core; +using namespace Opie::Core; SenderUI::SenderUI() : Sender() { 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 @@ -9,5 +9,5 @@ class IOSerial; class FileTransfer; class QSocketNotifier; -class OProcess; +namespace Opie {namespace Core {class Opie::Core::OProcess;}} class SenderUI : public Sender { Q_OBJECT @@ -28,5 +28,5 @@ private: int m_fd; 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 @@ -16,4 +16,5 @@ #include "transferdialog.h" +using namespace Opie::Ui; TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *) : QDialog(parent, 0l, false), m_win(mainwindow) @@ -99,5 +100,5 @@ void TransferDialog::slotFilename() QString f; - f = Opie::OFileDialog::getOpenFileName(0); + f = OFileDialog::getOpenFileName(0); if(!f.isNull()) filename->setText(f); } |