From 21f27ec4a1f18321ac00d28d93cb1cb7dc957d1f Mon Sep 17 00:00:00 2001 From: kergoth Date: Wed, 06 Nov 2002 04:50:40 +0000 Subject: Changing sharp define. if someone doesnt like it, let me know :) --- diff --git a/configs/linux-sharp-g++-shared b/configs/linux-sharp-g++-shared index 9c1dd03..862ee34 100644 --- a/configs/linux-sharp-g++-shared +++ b/configs/linux-sharp-g++-shared @@ -77,7 +77,7 @@ SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source -SYSCONF_CXXFLAGS = -pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W +SYSCONF_CXXFLAGS = -pipe -DQT_QWS_EBX -DQT_QWS_SHARP -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W SYSCONF_CFLAGS = -pipe -O2 -Wall -W # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) diff --git a/configs/linux-sharp-g++-shared-debug b/configs/linux-sharp-g++-shared-debug index 810eef5..5e7819c 100644 --- a/configs/linux-sharp-g++-shared-debug +++ b/configs/linux-sharp-g++-shared-debug @@ -77,7 +77,7 @@ SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source -SYSCONF_CXXFLAGS = -pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -g -Wall -W +SYSCONF_CXXFLAGS = -pipe -DQT_QWS_EBX -DQT_QWS_SHARP -DQWS -fno-exceptions -fno-rtti -g -Wall -W SYSCONF_CFLAGS = -pipe -g -Wall -W # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) diff --git a/configs/linux-sharp-g++-static b/configs/linux-sharp-g++-static index 15e4c7f..22d3d04 100644 --- a/configs/linux-sharp-g++-static +++ b/configs/linux-sharp-g++-static @@ -77,7 +77,7 @@ SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source -SYSCONF_CXXFLAGS = -pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W +SYSCONF_CXXFLAGS = -pipe -DQT_QWS_EBX -DQT_QWS_SHARP -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W SYSCONF_CFLAGS = -pipe -O2 -Wall -W SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) diff --git a/configs/linux-sharp-g++-static-debug b/configs/linux-sharp-g++-static-debug index d7715ed..9c1afd3 100644 --- a/configs/linux-sharp-g++-static-debug +++ b/configs/linux-sharp-g++-static-debug @@ -77,7 +77,7 @@ SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source -SYSCONF_CXXFLAGS = -pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -g -Wall -W +SYSCONF_CXXFLAGS = -pipe -DQT_QWS_EBX -DQT_QWS_SHARP -DQWS -fno-exceptions -fno-rtti -g -Wall -W SYSCONF_CFLAGS = -pipe -g -Wall -W SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp index d6ee6e8..cacc3c4 100644 --- a/core/apps/embeddedkonsole/TEWidget.cpp +++ b/core/apps/embeddedkonsole/TEWidget.cpp @@ -1105,7 +1105,7 @@ void TEWidget::frameChanged() void TEWidget::Bell() { -//#ifdef QT_QWS_CUSTOM +//#ifdef QT_QWS_SHARP //# ifndef QT_NO_COP QCopEnvelope( "QPE/TaskBar", "soundAlarm()" ); //# endif diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index f2e00d8..3e8c731 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp @@ -40,7 +40,7 @@ #include #include -#if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ ) +#if defined( QT_QWS_SHARP ) || defined( QT_QWS_IPAQ ) #include #endif diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index b517c7d..8b91f5d 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -25,7 +25,7 @@ #include #include #include -#if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ ) +#if defined( QT_QWS_SHARP ) || defined( QT_QWS_IPAQ ) #include #endif diff --git a/core/launcher/shutdownimpl.cpp b/core/launcher/shutdownimpl.cpp index 9292bb8..a202b7b 100644 --- a/core/launcher/shutdownimpl.cpp +++ b/core/launcher/shutdownimpl.cpp @@ -115,7 +115,7 @@ ShutdownImpl::ShutdownImpl( QWidget* parent, const char *name, WFlags fl ) m_progress-> hide ( ); Global::hideInputMethod ( ); -#ifdef QT_QWS_CUSTOM +#ifdef QT_QWS_SHARP shutdown-> hide ( ); #endif diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp index 7d1aaf1..1e6b74e 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp @@ -33,7 +33,7 @@ #include #include -#if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ ) +#if defined( QT_QWS_SHARP ) || defined( QT_QWS_IPAQ ) #include #endif @@ -169,7 +169,7 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn sysTray = new SysTray( this ); // ## make customizable in some way? -#ifdef QT_QWS_CUSTOM +#ifdef QT_QWS_SHARP lockState = new LockKeyState( this ); #else lockState = 0; diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.cpp b/core/multimedia/opieplayer/loopcontrol_threaded.cpp index c7dc7a8..1b89bc8 100644 --- a/core/multimedia/opieplayer/loopcontrol_threaded.cpp +++ b/core/multimedia/opieplayer/loopcontrol_threaded.cpp @@ -39,7 +39,7 @@ #include "mediaplayerstate.h" -#if defined(QT_QWS_CUSTOM) || defined(QT_QWS_IPAQ) +#if defined(QT_QWS_SHARP) || defined(QT_QWS_IPAQ) #define USE_REALTIME_AUDIO_THREAD #endif diff --git a/library/alarmserver.cpp b/library/alarmserver.cpp index 02bca3d..7e6e515 100644 --- a/library/alarmserver.cpp +++ b/library/alarmserver.cpp @@ -158,7 +158,7 @@ static bool triggerAtd( bool writeHWClock = FALSE ) if ( trigger.open(IO_WriteOnly|IO_Raw) ) { const char* data = -#ifdef QT_QWS_CUSTOM +#ifdef QT_QWS_SHARP //custom atd only writes HW Clock if we write a 'W' ( writeHWClock ) ? "W\n" : #endif diff --git a/library/power.cpp b/library/power.cpp index d53ecfe..ec5b309 100644 --- a/library/power.cpp +++ b/library/power.cpp @@ -20,7 +20,7 @@ #include "power.h" -#ifdef QT_QWS_CUSTOM +#ifdef QT_QWS_SHARP #include "custom.h" #endif @@ -132,7 +132,7 @@ bool PowerStatusManager::getProcApmStatus( int &ac, int &bs, int &bf, int &pc, i return ok; } -#ifdef QT_QWS_CUSTOM +#ifdef QT_QWS_SHARP void PowerStatusManager::getStatus() { diff --git a/library/storage.cpp b/library/storage.cpp index 937908d..3668d29 100644 --- a/library/storage.cpp +++ b/library/storage.cpp @@ -20,7 +20,7 @@ **********************************************************************/ #include -#ifdef QT_QWS_CUSTOM +#ifdef QT_QWS_SHARP #include #endif diff --git a/qt/qte233-for-opie091-keyboard.patch b/qt/qte233-for-opie091-keyboard.patch index 9d76a64..c1b85b6 100644 --- a/qt/qte233-for-opie091-keyboard.patch +++ b/qt/qte233-for-opie091-keyboard.patch @@ -35,7 +35,7 @@ + static int ipaq_return_pressed = false; // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 ! +#endif + - #if !defined(QT_QWS_CUSTOM) + #if !defined(QT_QWS_SHARP) - if (code == 224) { + if ((code == 224) +#if defined(QT_QWS_IPAQ) @@ -95,7 +95,7 @@ + break; } } else { - #if defined(QT_QWS_CUSTOM) + #if defined(QT_QWS_SHARP) @@ -650,6 +690,7 @@ repeatable = FALSE; break; -- cgit v0.9.0.2