author | zecke <zecke> | 2004-03-13 22:41:59 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 22:41:59 (UTC) |
commit | 3d27828732fe7e499219ad6e208dc13dead86431 (patch) (unidiff) | |
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 | |||
@@ -2,4 +2,6 @@ | |||
2 | #include "io_bt.h" | 2 | #include "io_bt.h" |
3 | 3 | ||
4 | using namespace Opie::Core; | ||
5 | using namespace Opie::Core; | ||
4 | IOBt::IOBt( const Profile &config ) : IOSerial( config ) { | 6 | IOBt::IOBt( const Profile &config ) : IOSerial( config ) { |
5 | m_attach = 0; | 7 | m_attach = 0; |
@@ -37,5 +39,5 @@ bool IOBt::open() { | |||
37 | // then start hcid, then rcfomm handling (m_mac) | 39 | // then start hcid, then rcfomm handling (m_mac) |
38 | 40 | ||
39 | connect( m_attach, SIGNAL( processExited(OProcess*) ), | 41 | connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), |
40 | this, SLOT( slotExited(OProcess*) ) ); | 42 | this, SLOT( slotExited(OProcess*) ) ); |
41 | 43 | ||
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: | |||
42 | 42 | ||
43 | private: | 43 | private: |
44 | OProcess *m_attach; | 44 | Opie::Core::OProcess *m_attach; |
45 | QString m_mac; | 45 | QString m_mac; |
46 | private slots: | 46 | private slots: |
47 | void slotExited(OProcess* proc); | 47 | void slotExited(Opie::Core::OProcess* proc); |
48 | 48 | ||
49 | }; | 49 | }; |
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 @@ | |||
2 | #include "io_irda.h" | 2 | #include "io_irda.h" |
3 | 3 | ||
4 | using namespace Opie::Core; | ||
5 | using namespace Opie::Core; | ||
4 | IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) { | 6 | IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) { |
5 | m_attach = 0; | 7 | m_attach = 0; |
@@ -28,5 +30,5 @@ bool IOIrda::open() { | |||
28 | *m_attach << "irattach /dev/ttyS2 -s"; | 30 | *m_attach << "irattach /dev/ttyS2 -s"; |
29 | 31 | ||
30 | connect( m_attach, SIGNAL( processExited(OProcess*) ), | 32 | connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), |
31 | this, SLOT( slotExited(OProcess*) ) ); | 33 | this, SLOT( slotExited(OProcess*) ) ); |
32 | 34 | ||
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: | |||
40 | 40 | ||
41 | private: | 41 | private: |
42 | OProcess *m_attach; | 42 | Opie::Core::OProcess *m_attach; |
43 | 43 | ||
44 | private slots: | 44 | private slots: |
45 | void slotExited(OProcess* proc); | 45 | void slotExited(Opie::Core::OProcess* proc); |
46 | 46 | ||
47 | }; | 47 | }; |
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 @@ | |||
4 | #include "dialer.h" | 4 | #include "dialer.h" |
5 | 5 | ||
6 | using namespace Opie::Core; | ||
7 | using namespace Opie::Core; | ||
6 | IOModem::IOModem( const Profile &profile ) | 8 | IOModem::IOModem( const Profile &profile ) |
7 | : IOSerial( profile ) { | 9 | : 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: | |||
68 | 68 | ||
69 | private slots: | 69 | private slots: |
70 | void slotExited(OProcess* proc); | 70 | void slotExited(Opie::Core::OProcess* proc); |
71 | 71 | ||
72 | }; | 72 | }; |
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 @@ | |||
25 | 25 | ||
26 | 26 | ||
27 | using namespace Opie::Ui; | ||
27 | MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) { | 28 | MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) { |
28 | KeyTrans::loadAll(); | 29 | KeyTrans::loadAll(); |
@@ -333,5 +334,5 @@ void MainWindow::slotSaveScript() { | |||
333 | text << "text/plain"; | 334 | text << "text/plain"; |
334 | map.insert(tr("Script"), text ); | 335 | map.insert(tr("Script"), text ); |
335 | QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map); | 336 | QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map); |
336 | if (!filename.isEmpty()) { | 337 | if (!filename.isEmpty()) { |
337 | QFileInfo info(filename); | 338 | QFileInfo info(filename); |
@@ -706,5 +707,5 @@ void MainWindow::slotSaveHistory() { | |||
706 | text << "text/plain"; | 707 | text << "text/plain"; |
707 | map.insert(tr("History"), text ); | 708 | map.insert(tr("History"), text ); |
708 | QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map); | 709 | QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map); |
709 | if (filename.isEmpty() ) return; | 710 | if (filename.isEmpty() ) return; |
710 | 711 | ||
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 @@ | |||
10 | #include "profileeditordialog.h" | 10 | #include "profileeditordialog.h" |
11 | 11 | ||
12 | using namespace Opie::Ui; | ||
12 | namespace { | 13 | namespace { |
13 | void setCurrent( const QString& str, QComboBox* bo ) { | 14 | 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: | |||
54 | ProfileDialogWidget* m_con, *m_term, *m_key; | 54 | ProfileDialogWidget* m_con, *m_term, *m_key; |
55 | QHBoxLayout *m_layCon, *m_layTerm, *m_layKey; | 55 | QHBoxLayout *m_layCon, *m_layTerm, *m_layKey; |
56 | OTabWidget *tabWidget; | 56 | Opie::Ui::OTabWidget *tabWidget; |
57 | QWidget *tabprof; | 57 | QWidget *tabprof; |
58 | int m_showconntab; | 58 | 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 @@ | |||
7 | 7 | ||
8 | 8 | ||
9 | using namespace Opie::Core; | ||
10 | using namespace Opie::Core; | ||
9 | SzTransfer::SzTransfer(Type t, IOLayer *layer) : FileTransferLayer(layer), m_t(t) | 11 | SzTransfer::SzTransfer(Type t, IOLayer *layer) : FileTransferLayer(layer), m_t(t) |
10 | { | 12 | { |
@@ -26,9 +28,9 @@ void SzTransfer::sendFile(const QString& file) { | |||
26 | *proc << "sz"; | 28 | *proc << "sz"; |
27 | *proc << "-v" << "-v" << "-b" << file; | 29 | *proc << "-v" << "-v" << "-b" << file; |
28 | connect(proc, SIGNAL(processExited(OProcess*)), | 30 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), |
29 | this, SLOT(sent())); | 31 | this, SLOT(sent())); |
30 | connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)), | 32 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
31 | this, SLOT(SzReceivedStdout(OProcess*,char*,int))); | 33 | this, SLOT(SzReceivedStdout(OProcess*,char*,int))); |
32 | connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)), | 34 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
33 | this, SLOT(SzReceivedStderr(OProcess*,char*,int))); | 35 | this, SLOT(SzReceivedStderr(OProcess*,char*,int))); |
34 | connect(layer(), SIGNAL(received(const QByteArray&)), | 36 | 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: | |||
28 | 28 | ||
29 | private slots: | 29 | private slots: |
30 | void SzReceivedStdout(OProcess *, char *, int); | 30 | void SzReceivedStdout(Opie::Core::OProcess *, char *, int); |
31 | void SzReceivedStderr(OProcess *, char *, int); | 31 | void SzReceivedStderr(Opie::Core::OProcess *, char *, int); |
32 | void receivedStdin(const QByteArray &); | 32 | void receivedStdin(const QByteArray &); |
33 | 33 | ||
34 | private: | 34 | private: |
35 | OProcess *proc; | 35 | Opie::Core::OProcess *proc; |
36 | Type m_t; | 36 | Type m_t; |
37 | 37 | ||
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 @@ | |||
2 | #include "tabwidget.h" | 2 | #include "tabwidget.h" |
3 | 3 | ||
4 | using namespace Opie::Ui; | ||
4 | TabWidget::TabWidget( QWidget* parent, const char* name ) | 5 | TabWidget::TabWidget( QWidget* parent, const char* name ) |
5 | : OTabWidget( parent, name ) { | 6 | : 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 @@ | |||
10 | * we can add sessions here | 10 | * we can add sessions here |
11 | */ | 11 | */ |
12 | class TabWidget : public OTabWidget{ | 12 | class TabWidget : public Opie::Ui::OTabWidget{ |
13 | Q_OBJECT | 13 | Q_OBJECT |
14 | public: | 14 | 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 @@ | |||
16 | #include "senderui.h" | 16 | #include "senderui.h" |
17 | 17 | ||
18 | using namespace Opie::Core; | ||
19 | using namespace Opie::Core; | ||
18 | SenderUI::SenderUI() | 20 | SenderUI::SenderUI() |
19 | : Sender() { | 21 | : 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; | |||
9 | class FileTransfer; | 9 | class FileTransfer; |
10 | class QSocketNotifier; | 10 | class QSocketNotifier; |
11 | class OProcess; | 11 | namespace Opie {namespace Core {class Opie::Core::OProcess;}} |
12 | class SenderUI : public Sender { | 12 | class SenderUI : public Sender { |
13 | Q_OBJECT | 13 | Q_OBJECT |
@@ -28,5 +28,5 @@ private: | |||
28 | int m_fd; | 28 | int m_fd; |
29 | QSocketNotifier* m_sock; | 29 | QSocketNotifier* m_sock; |
30 | OProcess* m_proc; | 30 | Opie::Core::OProcess* m_proc; |
31 | }; | 31 | }; |
32 | 32 | ||
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 @@ | |||
16 | #include "transferdialog.h" | 16 | #include "transferdialog.h" |
17 | 17 | ||
18 | using namespace Opie::Ui; | ||
18 | TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *) | 19 | TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *) |
19 | : QDialog(parent, 0l, false), m_win(mainwindow) | 20 | : QDialog(parent, 0l, false), m_win(mainwindow) |
@@ -99,5 +100,5 @@ void TransferDialog::slotFilename() | |||
99 | QString f; | 100 | QString f; |
100 | 101 | ||
101 | f = Opie::OFileDialog::getOpenFileName(0); | 102 | f = OFileDialog::getOpenFileName(0); |
102 | if(!f.isNull()) filename->setText(f); | 103 | if(!f.isNull()) filename->setText(f); |
103 | } | 104 | } |