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) (show 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
@@ -56,6 +56,7 @@
56const double deg2rad = 0.017453292519943295769; // pi/180 56const double deg2rad = 0.017453292519943295769; // pi/180
57const int sw_prec = 2; 57const int sw_prec = 2;
58 58
59using namespace Opie::Ui;
59void startPlayer() 60void startPlayer()
60{ 61{
61 Config config( "qpe" ); 62 Config config( "qpe" );
@@ -145,7 +146,7 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
145 146
146 alarmBtn->setText( tr( "Set Alarm" ) ); 147 alarmBtn->setText( tr( "Set Alarm" ) );
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." ) );
150 gl->addMultiCellWidget( click, 3, 3, 0, 2, AlignHCenter ); 151 gl->addMultiCellWidget( click, 3, 3, 0, 2, AlignHCenter );
151 connect( click, SIGNAL( clicked() ), this, SLOT( slotAdjustTime() ) ); 152 connect( click, SIGNAL( clicked() ), this, SLOT( slotAdjustTime() ) );
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
@@ -23,4 +23,6 @@
23#include <opie2/oapplicationfactory.h> 23#include <opie2/oapplicationfactory.h>
24 24
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
@@ -32,6 +32,7 @@
32#include <qbuttongroup.h> 32#include <qbuttongroup.h>
33#include <qcheckbox.h> 33#include <qcheckbox.h>
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 )
36 : QDialog( parent, name, modal, fl ) 37 : QDialog( parent, name, modal, fl )
37{ 38{
@@ -209,7 +210,7 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) {
209 QStringList text; 210 QStringList text;
210 text << "audio/*"; 211 text << "audio/*";
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 );
214 if(!str.isEmpty() ) { 215 if(!str.isEmpty() ) {
215 qDebug(str); 216 qDebug(str);
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
@@ -1,5 +1,7 @@
1/**************************************************************************** 1/****************************************************************************
2 * 2 *
3using namespace Opie::Core;
4using namespace Opie::Core;
3 * File: main.cpp 5 * File: main.cpp
4 * 6 *
5 * Description: main file for OPIE Euroconv aapp 7 * Description: main file for OPIE Euroconv aapp
@@ -18,7 +20,7 @@
18#include "calcdisplay.h" 20#include "calcdisplay.h"
19#include "calckeypad.h" 21#include "calckeypad.h"
20 22
21#include <opie/oapplicationfactory.h> 23#include <opie2/oapplicationfactory.h>
22 24
23struct Layout : QVBox{ 25struct Layout : QVBox{
24 static QString appName() { return QString::fromLatin1("euroconv"); } 26 static QString appName() { return QString::fromLatin1("euroconv"); }
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
@@ -11,7 +11,7 @@
11#include "output.h" 11#include "output.h"
12 12
13/* OPIE */ 13/* OPIE */
14#include <qpe/qpetoolbar.h> 14#include <qtoolbar.h>
15#include <qpe/qpeapplication.h> 15#include <qpe/qpeapplication.h>
16#include <qpe/resource.h> 16#include <qpe/resource.h>
17#include <qpe/config.h> 17#include <qpe/config.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
@@ -1,5 +1,6 @@
1 1
2/*************************************************************************** 2/***************************************************************************
3
3 main.cpp - description 4 main.cpp - description
4 ------------------- 5 -------------------
5 begin : March 10, 2002 6 begin : March 10, 2002
@@ -15,4 +16,5 @@
15 16
16#include <opie2/oapplicationfactory.h> 17#include <opie2/oapplicationfactory.h>
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
@@ -1,4 +1,4 @@
1 config OPIE-SH 1 config OPIE-SH
2 boolean "opie-sh (qdialog frontend allows you to write dialogs from shell scripts)" 2 boolean "opie-sh (qdialog frontend allows you to write dialogs from shell scripts)"
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
@@ -1,4 +1,4 @@
1 config REMOTE 1 config REMOTE
2 boolean "opie-remote (remote control using irda, frontent to lirc)" 2 boolean "opie-remote (remote control using irda, frontent to lirc)"
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
@@ -16,6 +16,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16 16
17#include "recorddialog.h" 17#include "recorddialog.h"
18 18
19using namespace Opie::Core;
20using namespace Opie::Core;
19RecordDialog::RecordDialog(QWidget *parent, const char *name) 21RecordDialog::RecordDialog(QWidget *parent, const char *name)
20 :QDialog(parent, name) 22 :QDialog(parent, name)
21{ 23{
@@ -49,9 +51,9 @@ void RecordDialog::retPressed()
49 51
50 if(where == 0) 52 if(where == 0)
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");
56 QString file = "/tmp/" + input->text(); 58 QString file = "/tmp/" + input->text();
57 *record<<"irrecord"<<file.latin1(); 59 *record<<"irrecord"<<file.latin1();
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
@@ -27,7 +27,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
27 27
28#include <stdio.h> 28#include <stdio.h>
29 29
30#include <opie/oprocess.h> 30#include <opie2/oprocess.h>
31 31
32class RecordDialog : public QDialog 32class RecordDialog : public QDialog
33{ 33{
@@ -36,12 +36,12 @@ public:
36 RecordDialog(QWidget *parent=0, const char *name=0); 36 RecordDialog(QWidget *parent=0, const char *name=0);
37public slots: 37public 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:
42 QTextView *output; 42 QTextView *output;
43 QLineEdit *input; 43 QLineEdit *input;
44 OProcess *record; 44 Opie::Core::OProcess *record;
45 int where; 45 int where;
46}; 46};
47 47
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
@@ -5,7 +5,7 @@ HEADERS = remotetab.h learntab.h configtab.h topgroup.h dvdgroup.h channelgroup
5 SOURCES =remote.cpp remotetab.cpp learntab.cpp configtab.cpp topgroup.cpp dvdgroup.cpp channelgroup.cpp vcrgroup.cpp buttondialog.cpp topgroupconf.cpp dvdgroupconf.cpp channelgroupconf.cpp vcrgroupconf.cpp mainview.cpp recorddialog.cpp helptab.cpp 5 SOURCES =remote.cpp remotetab.cpp learntab.cpp configtab.cpp topgroup.cpp dvdgroup.cpp channelgroup.cpp vcrgroup.cpp buttondialog.cpp topgroupconf.cpp dvdgroupconf.cpp channelgroupconf.cpp vcrgroupconf.cpp mainview.cpp recorddialog.cpp helptab.cpp
6 INCLUDEPATH+=$(OPIEDIR)/include 6 INCLUDEPATH+=$(OPIEDIR)/include
7 DEPENDPATH+=$(OPIEDIR)/include 7 DEPENDPATH+=$(OPIEDIR)/include
8 LIBS +=-lqpe -lopie 8 LIBS +=-lqpe -lopiecore2
9TARGET = remote 9TARGET = remote
10 10
11include ( $(OPIEDIR)/include.pro ) 11include ( $(OPIEDIR)/include.pro )