author | alwin <alwin> | 2004-03-02 12:14:15 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-02 12:14:15 (UTC) |
commit | 0d59c780513da78033f4d9040475dee9db0256d4 (patch) (side-by-side diff) | |
tree | 503d320b4aa3daae9982082e7b34e3e2c48bdfb7 /core/launcher/appicons.cpp | |
parent | a0981652d61776d70f25980f035748b21339e946 (diff) | |
download | opie-0d59c780513da78033f4d9040475dee9db0256d4.zip opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.gz opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.bz2 |
run the optimize_connect script
the whole cvs is tagged with "before_optimize_connect" if there are problems you
can check the diff (but it had compiled and run here)
-rw-r--r-- | core/launcher/appicons.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/core/launcher/appicons.cpp b/core/launcher/appicons.cpp index c51ee5a..4d48b24 100644 --- a/core/launcher/appicons.cpp +++ b/core/launcher/appicons.cpp @@ -1,12 +1,12 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -16,31 +16,33 @@ ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "appicons.h" -#include <qpe/qcopenvelope_qws.h> +#ifdef QWS +#include <qtopia/qcopenvelope_qws.h> +#endif #include <qtooltip.h> #include <qpixmap.h> AppIcons::AppIcons( QWidget *parent ) : QHBox(parent) { buttons.setAutoDelete(TRUE); #ifndef QT_NO_COP QCopChannel* channel = new QCopChannel("Qt/Tray", this); - connect(channel, SIGNAL(received(const QCString&, const QByteArray&)), - this, SLOT(receive(const QCString&, const QByteArray&))); + connect(channel, SIGNAL(received(const QCString&,const QByteArray&)), + this, SLOT(receive(const QCString&,const QByteArray&))); #endif } void AppIcons::setIcon(int id, const QPixmap& pm) { button(id)->setPixmap(pm); } @@ -63,17 +65,17 @@ signals: void clicked(const QPoint&, int, bool); }; QLabel* AppIcons::button(int id) { QLabel* f = buttons.find(id); if ( !f ) { buttons.insert(id,f=new FlatButton(this)); - connect(f,SIGNAL(clicked(const QPoint&, int, bool)),this,SLOT(clicked(const QPoint&, int, bool))); + connect(f,SIGNAL(clicked(const QPoint&,int,bool)),this,SLOT(clicked(const QPoint&,int,bool))); f->show(); } return f; } int AppIcons::findId(QLabel* b) { QIntDictIterator<QLabel> it(buttons); |