summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -11,29 +11,25 @@
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>
@@ -48,29 +44,25 @@ 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;
@@ -1018,29 +1010,25 @@ void redraw(int x, int y, int cx, int cy)
{
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)
@@ -1607,29 +1595,25 @@ void ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy)
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;