author | korovkin <korovkin> | 2006-07-07 18:36:16 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-07-07 18:36:16 (UTC) |
commit | 604065c6e662cb3894acf03abadafacc3ab52913 (patch) (unidiff) | |
tree | ccd91d113d0ac784e5ddc4f5d2000669ea552c2d | |
parent | 043999046de3e7088ef386f18348ebe4484b0e65 (diff) | |
download | opie-604065c6e662cb3894acf03abadafacc3ab52913.zip opie-604065c6e662cb3894acf03abadafacc3ab52913.tar.gz opie-604065c6e662cb3894acf03abadafacc3ab52913.tar.bz2 |
Added OResource -> Resource for backward compatibility with OPIE 1.2.0.
-rw-r--r-- | core/obex/obexsend.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp index 2512de3..5c177e3 100644 --- a/core/obex/obexsend.cpp +++ b/core/obex/obexsend.cpp | |||
@@ -1,42 +1,48 @@ | |||
1 | // 7-Jul-2005 mbh@sdgsystems.com: replace hand coded form with one | 1 | // 7-Jul-2005 mbh@sdgsystems.com: replace hand coded form with one |
2 | // generated via QT2 Designer. The new form supports | 2 | // generated via QT2 Designer. The new form supports |
3 | // selection of target devices, as opposed to sending to | 3 | // selection of target devices, as opposed to sending to |
4 | // all. | 4 | // all. |
5 | 5 | ||
6 | #include "obex.h" | 6 | #include "obex.h" |
7 | #include "btobex.h" | 7 | #include "btobex.h" |
8 | #include "obexsend.h" | 8 | #include "obexsend.h" |
9 | using namespace OpieObex; | 9 | using namespace OpieObex; |
10 | 10 | ||
11 | /* OPIE */ | 11 | /* OPIE */ |
12 | #include <opie2/odebug.h> | 12 | #include <opie2/odebug.h> |
13 | #include <qpe/qcopenvelope_qws.h> | 13 | #include <qpe/qcopenvelope_qws.h> |
14 | #include <opie2/oresource.h> | 14 | #include <opie2/oresource.h> |
15 | #include <qpe/version.h> | ||
15 | 16 | ||
16 | using namespace Opie::Core; | 17 | using namespace Opie::Core; |
17 | 18 | ||
18 | /* QT */ | 19 | /* QT */ |
19 | #include <qlabel.h> | 20 | #include <qlabel.h> |
20 | #include <qpushbutton.h> | 21 | #include <qpushbutton.h> |
21 | #include <qpixmap.h> | 22 | #include <qpixmap.h> |
22 | #include <qlistview.h> | 23 | #include <qlistview.h> |
23 | 24 | ||
24 | #include <unistd.h> | 25 | #include <unistd.h> |
25 | /* TRANSLATOR OpieObex::SendWidget */ | 26 | /* TRANSLATOR OpieObex::SendWidget */ |
26 | 27 | ||
28 | /* Just for backward compatibility */ | ||
29 | #if OPIE_VERSION < 102010 | ||
30 | #define OResource Resource | ||
31 | #endif | ||
32 | |||
27 | SendWidget::SendWidget( QWidget* parent, const char* name ) | 33 | SendWidget::SendWidget( QWidget* parent, const char* name ) |
28 | : obexSendBase( parent, name ) { | 34 | : obexSendBase( parent, name ) { |
29 | initUI(); | 35 | initUI(); |
30 | } | 36 | } |
31 | SendWidget::~SendWidget() { | 37 | SendWidget::~SendWidget() { |
32 | } | 38 | } |
33 | void SendWidget::initUI() { | 39 | void SendWidget::initUI() { |
34 | m_obex = new Obex(this, "obex"); | 40 | m_obex = new Obex(this, "obex"); |
35 | connect(m_obex, SIGNAL(error(int) ), | 41 | connect(m_obex, SIGNAL(error(int) ), |
36 | this, SLOT(slotIrError(int) ) ); | 42 | this, SLOT(slotIrError(int) ) ); |
37 | connect(m_obex, SIGNAL(sent(bool) ), | 43 | connect(m_obex, SIGNAL(sent(bool) ), |
38 | this, SLOT(slotIrSent(bool) ) ); | 44 | this, SLOT(slotIrSent(bool) ) ); |
39 | connect(m_obex, SIGNAL(currentTry(unsigned int) ), | 45 | connect(m_obex, SIGNAL(currentTry(unsigned int) ), |
40 | this, SLOT(slotIrTry(unsigned int) ) ); | 46 | this, SLOT(slotIrTry(unsigned int) ) ); |
41 | 47 | ||
42 | QCopChannel* chan = new QCopChannel("QPE/IrDaAppletBack", this ); | 48 | QCopChannel* chan = new QCopChannel("QPE/IrDaAppletBack", this ); |