applied the patch generated by the optimize_connect script from

TT.

1 files changed, 6 insertions, 6 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 262221e..c339a78 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -439,509 +439,509 @@ static void setTreble( int t = 0, int percent = -1 )
   \class QPEApplication
   \brief The QPEApplication class implements various system services
     that are available to all Qtopia applications.
 
   Simply by using QPEApplication instead of QApplication, a standard Qt
   application becomes a Qtopia application. It automatically follows
   style changes, quits and raises, and in the
   case of \link docwidget.html document-oriented\endlink applications,
   changes the currently displayed document in response to the environment.
 
   To create a \link docwidget.html document-oriented\endlink
   application use showMainDocumentWidget(); to create a
   non-document-oriented application use showMainWidget(). The
   keepRunning() function indicates whether the application will
   continue running after it's processed the last \link qcop.html
   QCop\endlink message. This can be changed using setKeepRunning().
 
   A variety of signals are emitted when certain events occur, for
   example, timeChanged(), clockChanged(), weekChanged(),
   dateFormatChanged() and volumeChanged(). If the application receives
   a \link qcop.html QCop\endlink message on the application's
   QPE/Application/\e{appname} channel, the appMessage() signal is
   emitted. There are also flush() and reload() signals, which
   are emitted when synching begins and ends respectively - upon these
   signals, the application should save and reload any data
   files that are involved in synching. Most of these signals will initially
   be received and unfiltered through the appMessage() signal.
 
   This class also provides a set of useful static functions. The
   qpeDir() and documentDir() functions return the respective paths.
   The grabKeyboard() and ungrabKeyboard() functions are used to
   control whether the application takes control of the device's
   physical buttons (e.g. application launch keys). The stylus' mode of
   operation is set with setStylusOperation() and retrieved with
   stylusOperation(). There are also setInputMethodHint() and
   inputMethodHint() functions.
 
   \ingroup qtopiaemb
 */
 
 /*!
   \fn void QPEApplication::clientMoused()
 
   \internal
 */
 
 /*!
   \fn void QPEApplication::timeChanged();
   This signal is emitted when the time changes outside the normal
   passage of time, i.e. if the time is set backwards or forwards.
 */
 
 /*!
   \fn void QPEApplication::clockChanged( bool ampm );
 
   This signal is emitted when the user changes the clock's style. If
   \a ampm is TRUE, the user wants a 12-hour AM/PM clock, otherwise,
   they want a 24-hour clock.
 */
 
 /*!
     \fn void QPEApplication::volumeChanged( bool muted )
 
     This signal is emitted whenever the mute state is changed. If \a
     muted is TRUE, then sound output has been muted.
 */
 
 /*!
     \fn void QPEApplication::weekChanged( bool startOnMonday )
 
     This signal is emitted if the week start day is changed. If \a
     startOnMonday is TRUE then the first day of the week is Monday; if
     \a startOnMonday is FALSE then the first day of the week is
     Sunday.
 */
 
 /*!
     \fn void QPEApplication::dateFormatChanged(DateFormat)
 
     This signal is emitted whenever the date format is changed.
 */
 
 /*!
     \fn void QPEApplication::flush()
 
     ###
 */
 
 /*!
   \fn void QPEApplication::reload()
 
 */
 
 
 
 void QPEApplication::processQCopFile()
 {
     QString qcopfn("/tmp/qcop-msg-");
     qcopfn += d->appName; // append command name
 
     QFile f(qcopfn);
     if ( f.open(IO_ReadWrite) ) {
 #ifndef Q_OS_WIN32
         flock(f.handle(), LOCK_EX);
 #endif
         QDataStream ds(&f);
         QCString channel, message;
         QByteArray data;
         while(!ds.atEnd()) {
             ds >> channel >> message >> data;
             d->enqueueQCop(channel,message,data);
         }
         ::ftruncate(f.handle(), 0);
 #ifndef Q_OS_WIN32
         f.flush();
         flock(f.handle(), LOCK_UN);
 #endif
     }
 #endif
 }
 
 
 /*!
   \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data )
 
   This signal is emitted when a message is received on this
   application's QPE/Application/<i>appname</i> \link qcop.html
   QCop\endlink channel.
 
   The slot to which you connect this signal uses \a msg and \a data
   in the following way:
 
 \code
      void MyWidget::receive( const QCString& msg, const QByteArray& data )
      {
        QDataStream stream( data, IO_ReadOnly );
        if ( msg == "someMessage(int,int,int)" ) {
             int a,b,c;
             stream >> a >> b >> c;
             ...
        } else if ( msg == "otherMessage(QString)" ) {
            ...
        }
     }
 \endcode
 
   \sa qcop.html
   Note that messages received here may be processed by qpe application
   and emitted as signals, such as flush() and reload().
 */
 
 /*!
   Constructs a QPEApplication just as you would construct
   a QApplication, passing \a argc, \a argv, and \a t.
 
   For applications, \a t should be the default, GuiClient. Only
   the Qtopia server passes GuiServer.
 */
 QPEApplication::QPEApplication( int & argc, char **argv, Type t )
                 : QApplication( hack(argc), argv, t ), pidChannel( 0 )
 {
         QPixmapCache::setCacheLimit(256); // sensible default for smaller devices.
 
         d = new QPEApplicationData;
         d->loadTextCodecs();
         d->loadImageCodecs();
                int dw = desktop() ->width();
 
         if ( dw < 200 ) {
                 setFont( QFont( "vera", 8 ) );
                 AppLnk::setSmallIconSize( 10 );
                 AppLnk::setBigIconSize( 28 );
         }
 #if defined(OPIE_HIGH_RES_SMALL_PHY)
         else if ( dw > 600 ) {
                 setFont( QFont( "vera", 16 ) );
                 AppLnk::setSmallIconSize( 24 );
                 AppLnk::setBigIconSize( 48 );
         }
 #endif
         else if ( dw > 200 ) {
                 setFont( QFont( "vera", 10 ) );
                 AppLnk::setSmallIconSize( 14 );
                 AppLnk::setBigIconSize( 32 );
         }
 
         QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
 
         connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );
 
 
         sysChannel = new QCopChannel( "QPE/System", this );
-        connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
-                 this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) );
+        connect( sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
+                 this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
 
 /* COde now in initapp */
 #if 0
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 
         QString qcopfn( "/tmp/qcop-msg-" );
         qcopfn += QString( argv[ 0 ] ); // append command name
 
         QFile f( qcopfn );
         if ( f.open( IO_ReadOnly ) ) {
                 flock( f.handle(), LOCK_EX );
         }
 
 
 
         QCString channel = QCString( argv[ 0 ] );
         channel.replace( QRegExp( ".*/" ), "" );
         d->appName = channel;
         channel = "QPE/Application/" + channel;
         pidChannel = new QCopChannel( channel, this );
-        connect( pidChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
-                 this, SLOT( pidMessage( const QCString &, const QByteArray & ) ) );
+        connect( pidChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
+                 this, SLOT( pidMessage(const QCString&,const QByteArray&) ) );
 
         if ( f.isOpen() ) {
                 d->keep_running = FALSE;
                 QDataStream ds( &f );
                 QCString channel, message;
                 QByteArray data;
                 while ( !ds.atEnd() ) {
                         ds >> channel >> message >> data;
                         d->enqueueQCop( channel, message, data );
                 }
 
                 flock( f.handle(), LOCK_UN );
                 f.close();
                 f.remove();
         }
 
         for ( int a = 0; a < argc; a++ ) {
                 if ( qstrcmp( argv[ a ], "-preload" ) == 0 ) {
                         argv[ a ] = argv[ a + 1 ];
                         a++;
                         d->preloaded = TRUE;
                         argc -= 1;
                 }
                 else if ( qstrcmp( argv[ a ], "-preload-show" ) == 0 ) {
                         argv[ a ] = argv[ a + 1 ];
                         a++;
                         d->preloaded = TRUE;
                         d->forceshow = TRUE;
                         argc -= 1;
                 }
         }
 
         /* overide stored arguments */
         setArgs( argc, argv );
 
 #endif
 #else
         initApp( argc, argv );
 #endif
         //  qwsSetDecoration( new QPEDecoration() );
 
 #ifndef QT_NO_TRANSLATION
 
         d->langs = Global::languageList();
         for ( QStringList::ConstIterator it = d->langs.begin(); it != d->langs.end(); ++it ) {
                 QString lang = *it;
 
                 installTranslation( lang + "/libopie.qm");
                 installTranslation( lang + "/libqpe.qm" );
                 installTranslation( lang + "/" + d->appName + ".qm" );
 
 
                 //###language/font hack; should look it up somewhere
 #ifdef QWS
 
                 if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
                     QFont fn = FontManager::unicodeFont( FontManager::Proportional );
                     setFont( fn );
                 }
 #endif
         }
 #endif
 
         applyStyle();
 
         if ( type() == GuiServer ) {
                 setVolume();
         }
 
         installEventFilter( this );
 
         QPEMenuToolFocusManager::initialize();
 
 #ifdef QT_NO_QWS_CURSOR
         // if we have no cursor, probably don't want tooltips
         QToolTip::setEnabled( FALSE );
 #endif
 }
 
 
 #ifdef QTOPIA_INTERNAL_INITAPP
 void QPEApplication::initApp( int argc, char **argv )
 {
     delete pidChannel;
     d->keep_running = TRUE;
     d->preloaded = FALSE;
     d->forceshow = FALSE;
 
     QCString channel = QCString(argv[0]);
 
     channel.replace(QRegExp(".*/"),"");
     d->appName = channel;
 
     #if QT_VERSION > 235
     qt_fbdpy->setIdentity( channel ); // In Qt/E 2.3.6
     #endif
 
     channel = "QPE/Application/" + channel;
     pidChannel = new QCopChannel( channel, this);
-    connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)),
-            this, SLOT(pidMessage(const QCString &, const QByteArray &)));
+    connect( pidChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+            this, SLOT(pidMessage(const QCString&,const QByteArray&)));
 
 
 
     processQCopFile();
     d->keep_running = d->qcopq.isEmpty();
 
     for (int a=0; a<argc; a++) {
         if ( qstrcmp(argv[a],"-preload")==0 ) {
             argv[a] = argv[a+1];
             a++;
             d->preloaded = TRUE;
             argc-=1;
         } else if ( qstrcmp(argv[a],"-preload-show")==0 ) {
             argv[a] = argv[a+1];
             a++;
             d->preloaded = TRUE;
             d->forceshow = TRUE;
             argc-=1;
         }
     }
 
     /* overide stored arguments */
     setArgs(argc, argv);
 
     /* install translation here */
     for ( QStringList::ConstIterator it = d->langs.begin(); it != d->langs.end(); ++it )
         installTranslation( (*it) + "/" + d->appName + ".qm" );
 }
 #endif
 
 
 static QPtrDict<void>* inputMethodDict = 0;
 static void createInputMethodDict()
 {
         if ( !inputMethodDict )
                 inputMethodDict = new QPtrDict<void>;
 }
 
 /*!
   Returns the currently set hint to the system as to whether
   widget \a w has any use for text input methods.
 
 
   \sa setInputMethodHint() InputMethodHint
 */
 QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget * w )
 {
         if ( inputMethodDict && w )
                 return ( InputMethodHint ) ( int ) inputMethodDict->find( w );
         return Normal;
 }
 
 /*!
   \enum QPEApplication::InputMethodHint
 
   \value Normal the application sometimes needs text input (the default).
   \value AlwaysOff the application never needs text input.
   \value AlwaysOn the application always needs text input.
 */
 
 /*!
   Hints to the system that widget \a w has use for text input methods
   as specified by \a mode.
 
   \sa inputMethodHint() InputMethodHint
 */
 void QPEApplication::setInputMethodHint( QWidget * w, InputMethodHint mode )
 {
         createInputMethodDict();
         if ( mode == Normal ) {
                 inputMethodDict->remove
                 ( w );
         }
         else {
                 inputMethodDict->insert( w, ( void* ) mode );
         }
 }
 
 class HackDialog : public QDialog
 {
 public:
         void acceptIt()
         {
                 accept();
         }
         void rejectIt()
         {
                 reject();
         }
 };
 
 
 void QPEApplication::mapToDefaultAction( QWSKeyEvent * ke, int key )
 {
         // specialised actions for certain widgets. May want to
         // add more stuff here.
         if ( activePopupWidget() && activePopupWidget() ->inherits( "QListBox" )
                 && activePopupWidget() ->parentWidget()
                 && activePopupWidget() ->parentWidget() ->inherits( "QComboBox" ) )
                 key = Qt::Key_Return;
 
         if ( activePopupWidget() && activePopupWidget() ->inherits( "QPopupMenu" ) )
                 key = Qt::Key_Return;
 
 #ifdef QWS
 
         ke->simpleData.keycode = key;
 #endif
 }
 
 class HackWidget : public QWidget
 {
 public:
         bool needsOk()
         {
                 return ( getWState() & WState_Reserved1 );
         }
 };
 
 /*!
   \internal
 */
 
 #ifdef QWS
 bool QPEApplication::qwsEventFilter( QWSEvent * e )
 {
         if ( !d->notbusysent && e->type == QWSEvent::Focus ) {
                 if ( qApp->type() != QApplication::GuiServer ) {
                         QCopEnvelope e( "QPE/System", "notBusy(QString)" );
                         e << d->appName;
                 }
                 d->notbusysent = TRUE;
         }
         if ( type() == GuiServer ) {
                 switch ( e->type ) {
                         case QWSEvent::Mouse:
                                 if ( e->asMouse() ->simpleData.state && !QWidget::find( e->window() ) )
                                         emit clientMoused();
                                 break;
                         default:
                                 break;
                 }
         }
         if ( e->type == QWSEvent::Key ) {
                 QWSKeyEvent *ke = ( QWSKeyEvent * ) e;
                 if ( ke->simpleData.keycode == Qt::Key_F33 ) {
                         // Use special "OK" key to press "OK" on top level widgets
                         QWidget * active = activeWindow();
                         QWidget *popup = 0;
                         if ( active && active->isPopup() ) {
                                 popup = active;
                                 active = active->parentWidget();
                         }
                         if ( active && ( int ) active->winId() == ke->simpleData.window &&
                                 !active->testWFlags( WStyle_Customize | WType_Popup | WType_Desktop ) ) {
                                 if ( ke->simpleData.is_press ) {
                                         if ( popup )
                                                 popup->close();
                                         if ( active->inherits( "QDialog" ) ) {
                                                 HackDialog * d = ( HackDialog * ) active;
                                                 d->acceptIt();
                                                 return TRUE;
                                         }
                                         else if ( ( ( HackWidget * ) active ) ->needsOk() ) {
                                                 QSignal s;
                                                 s.connect( active, SLOT( accept() ) );
                                                 s.activate();
                                         }
                                         else {
                                                 // do the same as with the select key: Map to the default action of the widget:
                                                 mapToDefaultAction( ke, Qt::Key_Return );
                                         }
                                 }
                         }
                 }
                 else if ( ke->simpleData.keycode == Qt::Key_F30 ) {
                         // Use special "select" key to do whatever default action a widget has
                         mapToDefaultAction( ke, Qt::Key_Space );
                 }
                 else if ( ke->simpleData.keycode == Qt::Key_Escape &&
                           ke->simpleData.is_press ) {
                         // Escape key closes app if focus on toplevel
                         QWidget * active = activeWindow();
                         if ( active && active->testWFlags( WType_TopLevel ) &&
                                 ( int ) active->winId() == ke->simpleData.window &&
                                 !active->testWFlags( WStyle_Dialog | WStyle_Customize | WType_Popup | WType_Desktop ) ) {
                                 if ( active->inherits( "QDialog" ) ) {
                                         HackDialog * d = ( HackDialog * ) active;
                                         d->rejectIt();
                                         return TRUE;
                                 }
                                 else if ( strcmp( argv() [ 0 ], "embeddedkonsole" ) != 0 ) {