| -rw-r--r-- | noncore/net/opierdesktop/qtwin.cpp | 16 |
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 @@ -7,74 +7,66 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. 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> #include <qmessagebox.h> #include <qpushbutton.h> #include <qlineedit.h> #include <qcombobox.h> #include <qlabel.h> #include <qfile.h> #include <qcheckbox.h> #include <qpopupmenu.h> #include "qtwin.h" #include <stdlib.h> uint32 flags; char server[64] = ""; char domain[16] = ""; char password[16] = ""; char shell[128] = ""; char directory[32] = ""; extern int g_width; 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; }; QColorMap* CM; uint8* BS; int clipx; int clipy; int clipcx; int clipcy; struct bitmap { @@ -1014,37 +1006,33 @@ void QMyMainWindow::dataReceived() //***************************************************************************** void redraw(int x, int y, int cx, int cy) { if (WarpCoords(&x, &y, &cx, &cy, NULL, NULL)) { MW->update(x, y, cx, 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 } return True; } */ /* void ui_deinit(void) { delete App; } */ @@ -1603,37 +1591,33 @@ void ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy) { uint8* data; int i, j; data = cache_get_desktop(offset, cx, cy, 1); for (i = 0; i < cy; i++) for (j = 0; j < cx; j++) set_pixel(x + j, y + i, data[i * cx + j]); redraw(x, y, cx, 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; delete App; if (CM != NULL) xfree(CM); if (BS !=NULL) xfree(BS); return 0; } /* MW = new QMyMainWindow(); |