summaryrefslogtreecommitdiff
path: root/library/applnk.cpp
authorzecke <zecke>2004-06-20 19:03:56 (UTC)
committer zecke <zecke>2004-06-20 19:03:56 (UTC)
commit44d69b04b5257592639d2a494c448202c86978c2 (patch) (unidiff)
tree9d776e08f6efa53abc6e2658c94b9e0e18324692 /library/applnk.cpp
parent2055cb9e96b27f95720240a2035ade27cb7bc098 (diff)
downloadopie-44d69b04b5257592639d2a494c448202c86978c2.zip
opie-44d69b04b5257592639d2a494c448202c86978c2.tar.gz
opie-44d69b04b5257592639d2a494c448202c86978c2.tar.bz2
Use A higher prime number in AppLnk
Somehow the Launcher triggers issues with libqpe and MimeType. Due the mix of calling MimeType::clear, MimeType type(doclnk.linkFile()), MimeType::clear the registration of Application was cleared and not reentered due the inner static variable in MimeType::init which was set. Now make sure that if we clear that we will reenter the Application in all cases!
Diffstat (limited to 'library/applnk.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--library/applnk.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/applnk.cpp b/library/applnk.cpp
index 5f7da8e..e9d519e 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -1247,65 +1247,65 @@ const AppLnk *AppLnkSet::findExec( const QString& exec ) const
1247/*! 1247/*!
1248 \fn const QList<DocLnk>& DocLnkSet::children() const 1248 \fn const QList<DocLnk>& DocLnkSet::children() const
1249 1249
1250 Returns the members of the set. 1250 Returns the members of the set.
1251*/ 1251*/
1252 1252
1253/*! 1253/*!
1254 Constructs an empty DocLnkSet. 1254 Constructs an empty DocLnkSet.
1255 1255
1256 \sa appendFrom() 1256 \sa appendFrom()
1257*/ 1257*/
1258DocLnkSet::DocLnkSet() 1258DocLnkSet::DocLnkSet()
1259{ 1259{
1260} 1260}
1261 1261
1262/*! 1262/*!
1263 Constructs a DocLnkSet that contains DocLnk objects representing all 1263 Constructs a DocLnkSet that contains DocLnk objects representing all
1264 the files in the \a directory (and any subdirectories, recursively). 1264 the files in the \a directory (and any subdirectories, recursively).
1265 1265
1266 If \a mimefilter is not null, 1266 If \a mimefilter is not null,
1267 only documents with a MIME type matching \a mimefilter are selected. 1267 only documents with a MIME type matching \a mimefilter are selected.
1268 The value may contain multiple wild-card patterns separated by ";", 1268 The value may contain multiple wild-card patterns separated by ";",
1269 such as \c{*o/mpeg;audio/x-wav}. 1269 such as \c{*o/mpeg;audio/x-wav}.
1270 1270
1271 See also \link applnk.html#files-and-links Files and Links\endlink. 1271 See also \link applnk.html#files-and-links Files and Links\endlink.
1272 1272
1273*/ 1273*/
1274DocLnkSet::DocLnkSet( const QString &directory, const QString& mimefilter ) : 1274DocLnkSet::DocLnkSet( const QString &directory, const QString& mimefilter ) :
1275 AppLnkSet() 1275 AppLnkSet()
1276{ 1276{
1277 QDir dir( directory ); 1277 QDir dir( directory );
1278 mFile = dir.dirName(); 1278 mFile = dir.dirName();
1279 QDict<void> reference; 1279 QDict<void> reference(1021);
1280 1280
1281 QStringList subFilter = QStringList::split(";", mimefilter); 1281 QStringList subFilter = QStringList::split(";", mimefilter);
1282 QValueList<QRegExp> mimeFilters; 1282 QValueList<QRegExp> mimeFilters;
1283 for( QStringList::Iterator it = subFilter.begin(); it != subFilter.end(); ++ it ) 1283 for( QStringList::Iterator it = subFilter.begin(); it != subFilter.end(); ++ it )
1284 mimeFilters.append( QRegExp(*it, FALSE, TRUE) ); 1284 mimeFilters.append( QRegExp(*it, FALSE, TRUE) );
1285 1285
1286 findChildren(directory, mimeFilters, reference); 1286 findChildren(directory, mimeFilters, reference);
1287 1287
1288 const QList<DocLnk> &list = children(); 1288 const QList<DocLnk> &list = children();
1289 for ( QListIterator<DocLnk> it( list ); it.current(); ++it ) { 1289 for ( QListIterator<DocLnk> it( list ); it.current(); ++it ) {
1290 reference.remove( (*it)->file() ); 1290 reference.remove( (*it)->file() );
1291 } 1291 }
1292 for ( QDictIterator<void> dit(reference); dit.current(); ++dit ) { 1292 for ( QDictIterator<void> dit(reference); dit.current(); ++dit ) {
1293 if ( dit.current() == (void*)2 ) { 1293 if ( dit.current() == (void*)2 ) {
1294 // Unreferenced, make an unwritten link 1294 // Unreferenced, make an unwritten link
1295 DocLnk* dl = new DocLnk; 1295 DocLnk* dl = new DocLnk;
1296 QFileInfo fi( dit.currentKey() ); 1296 QFileInfo fi( dit.currentKey() );
1297 dl->setFile(fi.filePath()); 1297 dl->setFile(fi.filePath());
1298 dl->setName(fi.baseName()); 1298 dl->setName(fi.baseName());
1299 // #### default to current path? 1299 // #### default to current path?
1300 // dl->setCategories( ... ); 1300 // dl->setCategories( ... );
1301 bool match = mimefilter.isNull(); 1301 bool match = mimefilter.isNull();
1302 if ( !match ) 1302 if ( !match )
1303 for( QValueList<QRegExp>::Iterator it = mimeFilters.begin(); it != mimeFilters.end() && !match; ++ it ) 1303 for( QValueList<QRegExp>::Iterator it = mimeFilters.begin(); it != mimeFilters.end() && !match; ++ it )
1304 if ( (*it).match(dl->type()) >= 0 ) 1304 if ( (*it).match(dl->type()) >= 0 )
1305 match = TRUE; 1305 match = TRUE;
1306 if ( match /* && dl->type() != "application/octet-stream" */ 1306 if ( match /* && dl->type() != "application/octet-stream" */
1307 && !!dl->exec() ) 1307 && !!dl->exec() )
1308 add(dl); 1308 add(dl);
1309 else 1309 else
1310 delete dl; 1310 delete dl;
1311 } 1311 }