- small code cleanup

 - finally we get rid of the "no image/text codecs" message at startup !!!

1 files changed, 20 insertions, 21 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index b5dff3a..c41dd06 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -47,239 +47,238 @@
 #include <qdialog.h>
 #include <qdragobject.h>
 #include <qtextcodec.h>
 #include <qevent.h>
 #include <qtooltip.h>
 #include <qsignal.h>
 #include "qpeapplication.h"
 #include "qpestyle.h"
 #include "styleinterface.h"
 #if QT_VERSION >= 300
 #include <qstylefactory.h>
 #else
 #include <qplatinumstyle.h>
 #include <qwindowsstyle.h>
 #include <qmotifstyle.h>
 #include <qmotifplusstyle.h>
 #include "lightstyle.h"
 
 #include <qpe/qlibrary.h>
 #endif
 #include "global.h"
 #include "resource.h"
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include "qutfcodec.h"
 #endif
 #include "config.h"
 #include "network.h"
 #ifdef QWS
 #include "fontmanager.h"
 #endif
 
 #include "alarmserver.h"
 #include "applnk.h"
 #include "qpemenubar.h"
 #include "textcodecinterface.h"
 #include "imagecodecinterface.h"
 
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 
 #include "qt_override_p.h"
 
 
 class QPEApplicationData
 {
 public:
-	QPEApplicationData() : presstimer( 0 ), presswidget( 0 ), rightpressed( FALSE ),
-			kbgrabber( 0 ), kbregrab( FALSE ), notbusysent( FALSE ), preloaded( FALSE ),
-			forceshow( FALSE ), nomaximize( FALSE ), qpe_main_widget( 0 ),
-			keep_running( TRUE )
+	QPEApplicationData() : presstimer( 0 ), presswidget( 0 ), kbgrabber( 0 ),
+			rightpressed( FALSE ),  kbregrab( FALSE ), notbusysent( FALSE ), preloaded( FALSE ),
+			forceshow( FALSE ), nomaximize( FALSE ), keep_running( TRUE ), qpe_main_widget( 0 )
+			
 	{
 		qcopq.setAutoDelete( TRUE );
 	}
 
 	int presstimer;
 	QWidget* presswidget;
-	QPoint presspos;
-bool rightpressed :
-	1; // AEH why not use uint foobar :1; if it's tt style -zecke
 	int kbgrabber;
-bool kbregrab :
-	1;
-bool notbusysent :
-	1;
+	QPoint presspos;
+
+	bool rightpressed : 1;
+	bool kbregrab     : 1;
+	bool notbusysent  : 1;
+	bool preloaded    : 1;
+	bool forceshow    : 1;
+	bool nomaximize   : 1;
+	bool keep_running : 1;
+
 	QString appName;
 	struct QCopRec
 	{
 		QCopRec( const QCString &ch, const QCString &msg,
 		         const QByteArray &d ) :
 				channel( ch ), message( msg ), data( d )
 		{ }
 
 		QCString channel;
 		QCString message;
 		QByteArray data;
 	};
-bool preloaded :
-	1;
-bool forceshow :
-	1;
-bool nomaximize :
-	1;
 	QWidget* qpe_main_widget;
-bool keep_running :
-	1;
 	QList<QCopRec> qcopq;
 
 	void enqueueQCop( const QCString &ch, const QCString &msg,
 	                  const QByteArray &data )
 	{
 		qcopq.append( new QCopRec( ch, msg, data ) );
 	}
 	void sendQCopQ()
 	{
 		QCopRec * r;
 #ifndef QT_NO_COP
 
 		for ( QListIterator<QCopRec> it( qcopq ); ( r = it.current() ); ++it )
 			QCopChannel::sendLocally( r->channel, r->message, r->data );
 #endif
 
 		qcopq.clear();
 	}
 	static void show_mx(QWidget* mw, bool nomaximize)
 	{
 		if ( mw->layout() && mw->inherits("QDialog") ) {
 			QPEApplication::showDialog((QDialog*)mw, nomaximize);
 		}
 		else {
 #ifdef Q_WS_QWS
 			if ( !nomaximize )
 				mw->showMaximized();
 			else
 #endif
 
 				mw->show();
 		}
 	}
 	static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
 	{
 		/*
 		// This works but disable it for now until it is safe to apply
 		// What is does is scan the .desktop files of all the apps for
 		// the applnk that has the corresponding argv[0] as this program
 		// then it uses the name stored in the .desktop file as the caption
 		// for the main widget. This saves duplicating translations for
 		// the app name in the program and in the .desktop files.
 
 		AppLnkSet apps( appsPath );
 
 		QList<AppLnk> appsList = apps.children();
 		for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
 		  if ( (*it)->exec() == appName ) {
 		mw->setCaption( (*it)->name() );
 		return TRUE;
 		  }
 		}
 		*/ 
 		return FALSE;
 	}
 
 
 	void show(QWidget* mw, bool nomax)
 	{
 		setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" );
 		nomaximize = nomax;
 		qpe_main_widget = mw;
 #ifndef QT_NO_COP
 
 		sendQCopQ();
 #endif
 
 		if ( preloaded ) {
 			if (forceshow)
 				show_mx(mw, nomax);
 		}
 		else if ( keep_running ) {
 			show_mx(mw, nomax);
 		}
 	}
 
 	void loadTextCodecs()
 	{
 		QString path = QPEApplication::qpeDir() + "/plugins/textcodecs";
 		QDir dir( path, "lib*.so" );
-		QStringList list = dir.entryList();
+		QStringList list;
+		if ( dir. exists ( ))
+		    list = dir.entryList();
 		QStringList::Iterator it;
 		for ( it = list.begin(); it != list.end(); ++it ) {
 			TextCodecInterface *iface = 0;
 			QLibrary *lib = new QLibrary( path + "/" + *it );
 			if ( lib->queryInterface( IID_QtopiaTextCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
 				QValueList<int> mibs = iface->mibEnums();
 				for (QValueList<int>::ConstIterator i = mibs.begin(); i != mibs.end(); ++i) {
 					(void)iface->createForMib(*i);
 					// ### it exists now; need to remember if we can delete it
 				}
 			}
 			else {
 				lib->unload();
 				delete lib;
 			}
 		}
 	}
 
 	void loadImageCodecs()
 	{
 		QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs";
 		QDir dir( path, "lib*.so" );
-		QStringList list = dir.entryList();
+		QStringList list;
+		if ( dir. exists ( ))
+		    list = dir.entryList();
 		QStringList::Iterator it;
 		for ( it = list.begin(); it != list.end(); ++it ) {
 			ImageCodecInterface *iface = 0;
 			QLibrary *lib = new QLibrary( path + "/" + *it );
 			if ( lib->queryInterface( IID_QtopiaImageCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
 				QStringList formats = iface->keys();
 				for (QStringList::ConstIterator i = formats.begin(); i != formats.end(); ++i) {
 					(void)iface->installIOHandler(*i);
 					// ### it exists now; need to remember if we can delete it
 				}
 			}
 			else {
 				lib->unload();
 				delete lib;
 			}
 		}
 	}
 	QString styleName;
 	QString decorationName;
 };
 
 class ResourceMimeFactory : public QMimeSourceFactory
 {
 public:
 	ResourceMimeFactory()
 	{
 		setFilePath( Global::helpPath() );
 		setExtensionType( "html", "text/html;charset=UTF-8" );
 	}
 
 	const QMimeSource* data( const QString& abs_name ) const
 	{
 		const QMimeSource * r = QMimeSourceFactory::data( abs_name );
 		if ( !r ) {
 			int sl = abs_name.length();
 			do {
 				sl = abs_name.findRev( '/', sl - 1 );
 				QString name = sl >= 0 ? abs_name.mid( sl + 1 ) : abs_name;
 				int dot = name.findRev( '.' );
 				if ( dot >= 0 )
 					name = name.left( dot );
 				QImage img = Resource::loadImage( name );
 				if ( !img.isNull() )
 					r = new QImageDrag( img );
 			}
 			while ( !r && sl > 0 );
 		}
 		return r;