1 files changed, 12 insertions, 5 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index acad81d..35f433c 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -129,14 +129,19 @@ public:
         fontFamily = cfg.readEntry( "FontFamily", "Vera" );
         fontSize = cfg.readNumEntry( "FontSize", 10 );
         smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 );
         bigIconSize = cfg.readNumEntry( "BigIconSize", 32 );
+#ifdef OPIE_ROHFEEDBACK
         RoH = 0;
+#endif
     }
 
     int presstimer;
     QWidget* presswidget;
     QPoint presspos;
+#ifdef OPIE_ROHFEEDBACK
+    Opie::Internal::RoHFeedback *RoH;
+#endif
 
     bool rightpressed : 1;
     bool kbgrabbed    : 1;
     bool notbusysent  : 1;
@@ -496,10 +501,8 @@ static void qpe_show_dialog( QDialog* d, bool nomax )
                 delete lib;
             }
         }
     }
-
-    Opie::Internal::RoHFeedback * RoH;
 };
 
 class ResourceMimeFactory : public QMimeSourceFactory
 {
@@ -1211,9 +1214,11 @@ QPEApplication::~QPEApplication()
     // be gone by the time we get to ~QObject().
     delete sysChannel;
     delete pidChannel;
 #endif
+#ifdef OPIE_ROHFEEDBACK
     delete d->RoH;
+#endif
     delete d;
 }
 
 /*!
@@ -2034,9 +2039,9 @@ bool QPEApplication::eventFilter( QObject *o, QEvent *e )
                             d->presspos = me->pos();
                             d->rightpressed = FALSE;
                             // just for the time being
                             static int pref = 500;
-#ifdef WITHROHFEEDBACK
+#ifdef OPIE_ROHFEEDBACK
                             if( ! d->RoH )
                               d->RoH = new Opie::Internal::RoHFeedback;
 
                             d->RoH->init( me->globalPos(), d->presswidget );
@@ -2049,9 +2054,9 @@ bool QPEApplication::eventFilter( QObject *o, QEvent *e )
                         break;
                     case QEvent::MouseMove:
                         if (d->presstimer && (me->pos() - d->presspos).manhattanLength() > 8) {
                             killTimer(d->presstimer);
-#ifdef WITHROHFEEDBACK
+#ifdef OPIE_ROHFEEDBACK
                             if( d->RoH )
                               d->RoH->stop( );
 #endif
                             d->presstimer = 0;
@@ -2060,9 +2065,9 @@ bool QPEApplication::eventFilter( QObject *o, QEvent *e )
                     case QEvent::MouseButtonRelease:
                         if ( me->button() == LeftButton ) {
                             if ( d->presstimer ) {
                                 killTimer(d->presstimer);
-#ifdef WITHROHFEEDBACK
+#ifdef OPIE_ROHFEEDBACK
                                 if( d->RoH )
                                   d->RoH->stop( );
 #endif
                                 d->presstimer = 0;
@@ -2117,9 +2122,11 @@ void QPEApplication::timerEvent( QTimerEvent *e )
                                     RightButton, LeftButton ) );
         killTimer( d->presstimer );
         d->presstimer = 0;
         d->rightpressed = TRUE;
+#ifdef OPIE_ROHFEEDBACK
         d->RoH->stop();
+#endif
     }
 }
 
 void QPEApplication::removeSenderFromStylusDict()