summaryrefslogtreecommitdiff
path: root/noncore/net
authorzecke <zecke>2005-02-14 16:06:11 (UTC)
committer zecke <zecke>2005-02-14 16:06:11 (UTC)
commit277adb0af903b8bc2760c20891b664b763b667d9 (patch) (unidiff)
tree9d6b33b8ed71f9f280981630ad45f3f8ba33eafb /noncore/net
parent866b55b819809a7bc448ea8b9cf2597051518007 (diff)
downloadopie-277adb0af903b8bc2760c20891b664b763b667d9.zip
opie-277adb0af903b8bc2760c20891b664b763b667d9.tar.gz
opie-277adb0af903b8bc2760c20891b664b763b667d9.tar.bz2
Remove stupid #ifdef
Diffstat (limited to 'noncore/net') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opierdesktop/qtwin.cpp16
1 files changed, 0 insertions, 16 deletions
diff --git a/noncore/net/opierdesktop/qtwin.cpp b/noncore/net/opierdesktop/qtwin.cpp
index d2a5ef1..e350bf6 100644
--- a/noncore/net/opierdesktop/qtwin.cpp
+++ b/noncore/net/opierdesktop/qtwin.cpp
@@ -19,13 +19,9 @@
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20*/ 20*/
21 21
22#include "rdesktop.h" 22#include "rdesktop.h"
23#ifdef SHARP
24#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
25#else
26#include <qapplication.h>
27#endif
28#include <qmainwindow.h> 24#include <qmainwindow.h>
29#include <qwidget.h> 25#include <qwidget.h>
30#include <qpainter.h> 26#include <qpainter.h>
31#include <qimage.h> 27#include <qimage.h>
@@ -56,13 +52,9 @@ extern BOOL fullscreen;
56extern char username[]; 52extern char username[];
57int global_sock; 53int global_sock;
58 54
59QSocketNotifier* SocketNotifier; 55QSocketNotifier* SocketNotifier;
60#ifdef SHARP
61QPEApplication* App; 56QPEApplication* App;
62#else
63QApplication* App;
64#endif
65QMyMainWindow* MW; 57QMyMainWindow* MW;
66QMyScrollView* SV; 58QMyScrollView* SV;
67struct QColorMap 59struct QColorMap
68{ 60{
@@ -1026,13 +1018,9 @@ BOOL ui_init(void)
1026 QWidget* d; 1018 QWidget* d;
1027 1019
1028 CM = NULL; 1020 CM = NULL;
1029 BS = NULL; 1021 BS = NULL;
1030#ifdef SHARP
1031 App = new QPEApplication(g_argc, g_argv); 1022 App = new QPEApplication(g_argc, g_argv);
1032#else
1033 App = new QApplication(g_argc, g_argv, QApplication::GuiServer);
1034#endif
1035 if (fullscreen) 1023 if (fullscreen)
1036 { 1024 {
1037 d = QApplication::desktop(); 1025 d = QApplication::desktop();
1038 width = d->width(); // returns screen width 1026 width = d->width(); // returns screen width
@@ -1615,13 +1603,9 @@ void ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy)
1615int main(int argc, char** argv) 1603int main(int argc, char** argv)
1616{ 1604{
1617 CM = NULL; 1605 CM = NULL;
1618 BS = NULL; 1606 BS = NULL;
1619#ifdef SHARP
1620 App = new QPEApplication(argc, argv); 1607 App = new QPEApplication(argc, argv);
1621#else
1622 App = new QApplication(argc, argv, QApplication::GuiServer);
1623#endif
1624 SV = new QMyScrollView(); 1608 SV = new QMyScrollView();
1625 App->setMainWidget(SV); 1609 App->setMainWidget(SV);
1626 SV->showMaximized(); 1610 SV->showMaximized();
1627 SV->timer_id = SV->startTimer(1000); 1611 SV->timer_id = SV->startTimer(1000);