summaryrefslogtreecommitdiff
authorzecke <zecke>2005-04-16 22:00:51 (UTC)
committer zecke <zecke>2005-04-16 22:00:51 (UTC)
commit632d3e87a7e2cf6efecb676987d622e937ecafb8 (patch) (side-by-side diff)
tree6689c8549e494841108217daa21913ec27565720
parent790b371e6c7ed9da76eafb8a5b2e5d5458b320d8 (diff)
downloadopie-632d3e87a7e2cf6efecb676987d622e937ecafb8.zip
opie-632d3e87a7e2cf6efecb676987d622e937ecafb8.tar.gz
opie-632d3e87a7e2cf6efecb676987d622e937ecafb8.tar.bz2
Opie/X11:
Minor updates to build a recent Opie version for usage with the X Window System
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--x11/libqpe-x11/qpe/qpeapplication.cpp20
-rw-r--r--x11/libqpe-x11/qpe/qpeapplication.h6
-rw-r--r--x11/libqpe-x11/qt/qwindowsystem_qws.h3
3 files changed, 22 insertions, 7 deletions
diff --git a/x11/libqpe-x11/qpe/qpeapplication.cpp b/x11/libqpe-x11/qpe/qpeapplication.cpp
index 73e7ce4..c49f3ad 100644
--- a/x11/libqpe-x11/qpe/qpeapplication.cpp
+++ b/x11/libqpe-x11/qpe/qpeapplication.cpp
@@ -415,7 +415,7 @@ void QPEApplication::applyStyle() {
int QPEApplication::defaultRotation() {
return 0;
}
-void QPEApplication::setDefaultRotation(int r ) {
+void QPEApplication::setDefaultRotation(int) {
}
void QPEApplication::grabKeyboard() {
@@ -449,6 +449,14 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool m) {
d->show(mw, m );
}
void QPEApplication::showDialog( QDialog* d, bool nomax ) {
+ showWidget( d, nomax );
+}
+int QPEApplication::execDialog( QDialog* d, bool nomax) {
+ showDialog(d,nomax);
+ return d->exec();
+}
+
+void QPEApplication::showWidget( QWidget* d, bool nomax ) {
QSize sh = d->sizeHint();
int w = QMAX(sh.width(),d->width());
int h = QMAX(sh.height(),d->height());
@@ -462,10 +470,7 @@ void QPEApplication::showDialog( QDialog* d, bool nomax ) {
d->show();
}
}
-int QPEApplication::execDialog( QDialog* d, bool nomax) {
- showDialog(d,nomax);
- return d->exec();
-}
+
void QPEApplication::setKeepRunning() {
if ( qApp && qApp->inherits( "QPEApplication" ) ) {
QPEApplication * qpeApp = ( QPEApplication* ) qApp;
@@ -757,6 +762,7 @@ int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool b ) {
#define KeyRelease XKeyRelease
#if defined(OPIE_NEW_MALLOC)
+#define likely(x) x
// The libraries with the skiff package (and possibly others) have
// completely useless implementations of builtin new and delete that
@@ -775,21 +781,25 @@ void* operator new( size_t size )
void operator delete[]( void* p )
{
+ if ( likely(p) )
free( p );
}
void operator delete[]( void* p, size_t /*size*/ )
{
+ if ( likely(p) )
free( p );
}
void operator delete( void* p )
{
+ if ( likely(p) )
free( p );
}
void operator delete( void* p, size_t /*size*/ )
{
+ if ( likely(p) )
free( p );
}
diff --git a/x11/libqpe-x11/qpe/qpeapplication.h b/x11/libqpe-x11/qpe/qpeapplication.h
index b1fc074..5521998 100644
--- a/x11/libqpe-x11/qpe/qpeapplication.h
+++ b/x11/libqpe-x11/qpe/qpeapplication.h
@@ -7,8 +7,9 @@
#include <qapplication.h>
#include <qevent.h>
-
-#include <qpe/timestring.h>
+#include <qtopia/timestring.h>
+#include <unistd.h>
+#include <stdlib.h>
class QCopChannel;
class QPEApplication : public QApplication {
@@ -47,6 +48,7 @@ public:
static void showDialog( QDialog*, bool nomax = FALSE );
static int execDialog( QDialog*, bool nomax = FALSE );
+ static void showWidget( QWidget*, bool nomax = FALSE );
static void setKeepRunning();
bool keepRunning()const;
diff --git a/x11/libqpe-x11/qt/qwindowsystem_qws.h b/x11/libqpe-x11/qt/qwindowsystem_qws.h
index 88902c8..42470cd 100644
--- a/x11/libqpe-x11/qt/qwindowsystem_qws.h
+++ b/x11/libqpe-x11/qt/qwindowsystem_qws.h
@@ -10,6 +10,9 @@ QWSServer(){}
~QWSServer(){}
static void sendKeyEvent(int, int, int, bool, bool ) { }
struct KeyboardFilter {
+ bool filter(int,int,int,bool,bool) {
+ return false;
+ }
};
static void setKeyboardFilter( KeyboardFilter* ) {