summaryrefslogtreecommitdiff
authorzecke <zecke>2005-02-14 16:06:11 (UTC)
committer zecke <zecke>2005-02-14 16:06:11 (UTC)
commit277adb0af903b8bc2760c20891b664b763b667d9 (patch) (side-by-side diff)
tree9d6b33b8ed71f9f280981630ad45f3f8ba33eafb
parent866b55b819809a7bc448ea8b9cf2597051518007 (diff)
downloadopie-277adb0af903b8bc2760c20891b664b763b667d9.zip
opie-277adb0af903b8bc2760c20891b664b763b667d9.tar.gz
opie-277adb0af903b8bc2760c20891b664b763b667d9.tar.bz2
Remove stupid #ifdef
Diffstat (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
@@ -17,17 +17,13 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "rdesktop.h"
-#ifdef SHARP
#include <qpe/qpeapplication.h>
-#else
-#include <qapplication.h>
-#endif
#include <qmainwindow.h>
#include <qwidget.h>
#include <qpainter.h>
#include <qimage.h>
#include <qsocketnotifier.h>
#include <qscrollview.h>
@@ -54,17 +50,13 @@ extern int g_height;
extern int server_bpp;
extern BOOL fullscreen;
extern char username[];
int global_sock;
QSocketNotifier* SocketNotifier;
-#ifdef SHARP
QPEApplication* App;
-#else
-QApplication* App;
-#endif
QMyMainWindow* MW;
QMyScrollView* SV;
struct QColorMap
{
uint32 RGBColors[256];
int NumColors;
@@ -1024,17 +1016,13 @@ void redraw(int x, int y, int cx, int cy)
BOOL ui_init(void)
{
QWidget* d;
CM = NULL;
BS = NULL;
-#ifdef SHARP
App = new QPEApplication(g_argc, g_argv);
-#else
- App = new QApplication(g_argc, g_argv, QApplication::GuiServer);
-#endif
if (fullscreen)
{
d = QApplication::desktop();
width = d->width(); // returns screen width
height = d->height(); // returns screen height
}
@@ -1613,17 +1601,13 @@ void ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy)
//*****************************************************************************
int main(int argc, char** argv)
{
CM = NULL;
BS = NULL;
-#ifdef SHARP
App = new QPEApplication(argc, argv);
-#else
- App = new QApplication(argc, argv, QApplication::GuiServer);
-#endif
SV = new QMyScrollView();
App->setMainWidget(SV);
SV->showMaximized();
SV->timer_id = SV->startTimer(1000);
App->exec();
delete SV;