summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 15:07:48 (UTC)
committer zecke <zecke>2004-03-14 15:07:48 (UTC)
commit8a243adc61fc9c8a48fa9061f0eba12c7b345d70 (patch) (unidiff)
tree8f240482113d5588c4fb73769a2ced2ccdb87fb9
parent346288b5a95b72a84fabe9acb2e32aa8a8388c8c (diff)
downloadopie-8a243adc61fc9c8a48fa9061f0eba12c7b345d70.zip
opie-8a243adc61fc9c8a48fa9061f0eba12c7b345d70.tar.gz
opie-8a243adc61fc9c8a48fa9061f0eba12c7b345d70.tar.bz2
Opie2 and ODP changes
Also try to make signals/slots syntax obey the namespaces
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/clock/clock.cpp3
-rw-r--r--noncore/tools/clock/main.cpp2
-rw-r--r--noncore/tools/clock/setAlarm.cpp3
-rw-r--r--noncore/tools/euroconv/main.cpp4
-rw-r--r--noncore/tools/formatter/formatter.cpp2
-rw-r--r--noncore/tools/formatter/main.cpp2
-rw-r--r--noncore/tools/opie-sh/config.in2
-rw-r--r--noncore/tools/remote/config.in2
-rw-r--r--noncore/tools/remote/recorddialog.cpp8
-rw-r--r--noncore/tools/remote/recorddialog.h8
-rw-r--r--noncore/tools/remote/remote.pro2
11 files changed, 24 insertions, 14 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index b780675..485354b 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -58,2 +58,3 @@ const int sw_prec = 2;
58 58
59using namespace Opie::Ui;
59void startPlayer() 60void startPlayer()
@@ -147,3 +148,3 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
147 148
148 Opie::OClickableLabel *click = new Opie::OClickableLabel( controls, "label" ); 149 OClickableLabel *click = new Opie::Ui::OClickableLabel( controls, "label" );
149 click->setText( tr( "Set date and time." ) ); 150 click->setText( tr( "Set date and time." ) );
diff --git a/noncore/tools/clock/main.cpp b/noncore/tools/clock/main.cpp
index 89dd1bd..237d9f0 100644
--- a/noncore/tools/clock/main.cpp
+++ b/noncore/tools/clock/main.cpp
@@ -25,2 +25,4 @@
25 25
26using namespace Opie::Core;
27using namespace Opie::Core;
26OPIE_EXPORT_APP( OApplicationFactory<Clock> ) 28OPIE_EXPORT_APP( OApplicationFactory<Clock> )
diff --git a/noncore/tools/clock/setAlarm.cpp b/noncore/tools/clock/setAlarm.cpp
index 6fec5a0..9d5fc49 100644
--- a/noncore/tools/clock/setAlarm.cpp
+++ b/noncore/tools/clock/setAlarm.cpp
@@ -34,2 +34,3 @@
34 34
35using namespace Opie::Ui;
35Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl ) 36Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl )
@@ -211,3 +212,3 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) {
211 map.insert(tr("Audio"), text ); 212 map.insert(tr("Audio"), text );
212 QString str = Opie::OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); 213 QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this );
213// QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); 214// QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this );
diff --git a/noncore/tools/euroconv/main.cpp b/noncore/tools/euroconv/main.cpp
index b765a5e..d5f6c7f 100644
--- a/noncore/tools/euroconv/main.cpp
+++ b/noncore/tools/euroconv/main.cpp
@@ -2,2 +2,4 @@
2 * 2 *
3using namespace Opie::Core;
4using namespace Opie::Core;
3 * File: main.cpp 5 * File: main.cpp
@@ -20,3 +22,3 @@
20 22
21#include <opie/oapplicationfactory.h> 23#include <opie2/oapplicationfactory.h>
22 24
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index 77e1790..4204d73 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -13,3 +13,3 @@
13/* OPIE */ 13/* OPIE */
14#include <qpe/qpetoolbar.h> 14#include <qtoolbar.h>
15#include <qpe/qpeapplication.h> 15#include <qpe/qpeapplication.h>
diff --git a/noncore/tools/formatter/main.cpp b/noncore/tools/formatter/main.cpp
index bdd4a2c..d47479e 100644
--- a/noncore/tools/formatter/main.cpp
+++ b/noncore/tools/formatter/main.cpp
@@ -2,2 +2,3 @@
2/*************************************************************************** 2/***************************************************************************
3
3 main.cpp - description 4 main.cpp - description
@@ -17,2 +18,3 @@
17 18
19using namespace Opie::Core;
18OPIE_EXPORT_APP( OApplicationFactory<FormatterApp> ) 20OPIE_EXPORT_APP( OApplicationFactory<FormatterApp> )
diff --git a/noncore/tools/opie-sh/config.in b/noncore/tools/opie-sh/config.in
index 614ac8b..b3ca373 100644
--- a/noncore/tools/opie-sh/config.in
+++ b/noncore/tools/opie-sh/config.in
@@ -3,2 +3,2 @@
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 )
diff --git a/noncore/tools/remote/config.in b/noncore/tools/remote/config.in
index 3b70590..2a42c58 100644
--- a/noncore/tools/remote/config.in
+++ b/noncore/tools/remote/config.in
@@ -3,2 +3,2 @@
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
diff --git a/noncore/tools/remote/recorddialog.cpp b/noncore/tools/remote/recorddialog.cpp
index 1ce5472..a9c4c61 100644
--- a/noncore/tools/remote/recorddialog.cpp
+++ b/noncore/tools/remote/recorddialog.cpp
@@ -18,2 +18,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18 18
19using namespace Opie::Core;
20using namespace Opie::Core;
19RecordDialog::RecordDialog(QWidget *parent, const char *name) 21RecordDialog::RecordDialog(QWidget *parent, const char *name)
@@ -51,5 +53,5 @@ void RecordDialog::retPressed()
51 { 53 {
52 connect(record, SIGNAL(receivedStdout(OProcess*,char*,int)), this, SLOT(incoming(OProcess*,char*,int)) ); 54 connect(record, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), this, SLOT(incoming(Opie::Core::OProcess*,char*,int)) );
53 connect(record, SIGNAL(receivedStderr(OProcess*,char*,int)), this, SLOT(incoming(OProcess*,char*,int)) ); 55 connect(record, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT(incoming(Opie::Core::OProcess*,char*,int)) );
54 connect(record, SIGNAL(processExited(OProcess*)), this, SLOT(done(OProcess*)) ); 56 connect(record, SIGNAL(processExited(Opie::Core::OProcess*)), this, SLOT(done(Opie::Core::OProcess*)) );
55 printf("RecordDialog::retPressed: starting irrecord\n"); 57 printf("RecordDialog::retPressed: starting irrecord\n");
diff --git a/noncore/tools/remote/recorddialog.h b/noncore/tools/remote/recorddialog.h
index e4dcae6..46a82ce 100644
--- a/noncore/tools/remote/recorddialog.h
+++ b/noncore/tools/remote/recorddialog.h
@@ -29,3 +29,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
29 29
30#include <opie/oprocess.h> 30#include <opie2/oprocess.h>
31 31
@@ -38,4 +38,4 @@ public slots:
38 void retPressed(); 38 void retPressed();
39 void incoming(OProcess *proc, char *buffer, int len); 39 void incoming(Opie::Core::OProcess *proc, char *buffer, int len);
40 void done(OProcess *proc); 40 void done(Opie::Core::OProcess *proc);
41private: 41private:
@@ -43,3 +43,3 @@ private:
43 QLineEdit *input; 43 QLineEdit *input;
44 OProcess *record; 44 Opie::Core::OProcess *record;
45 int where; 45 int where;
diff --git a/noncore/tools/remote/remote.pro b/noncore/tools/remote/remote.pro
index 660c7f7..8b3e4be 100644
--- a/noncore/tools/remote/remote.pro
+++ b/noncore/tools/remote/remote.pro
@@ -7,3 +7,3 @@ INCLUDEPATH +=$(OPIEDIR)/include
7 DEPENDPATH+=$(OPIEDIR)/include 7 DEPENDPATH+=$(OPIEDIR)/include
8 LIBS +=-lqpe -lopie 8 LIBS +=-lqpe -lopiecore2
9TARGET = remote 9TARGET = remote