summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-05-04 13:12:11 (UTC)
committer llornkcor <llornkcor>2003-05-04 13:12:11 (UTC)
commit8409a251d52b59585889e1bcaa278a6b847db2fc (patch) (side-by-side diff)
tree50f085a116cdb739705aa3c40ceececc99833465
parent8489a583d5b762c5530076271ee3c3be7011b9ef (diff)
downloadopie-8409a251d52b59585889e1bcaa278a6b847db2fc.zip
opie-8409a251d52b59585889e1bcaa278a6b847db2fc.tar.gz
opie-8409a251d52b59585889e1bcaa278a6b847db2fc.tar.bz2
remove debug message - Cannot find icon
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/applnk.cpp712
1 files changed, 356 insertions, 356 deletions
diff --git a/library/applnk.cpp b/library/applnk.cpp
index 00030e8..4adf1bd 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -51,3 +51,3 @@ static QString safeFileName(const QString& n)
{
- QString safename=n;
+ QString safename=n;
safename.replace(QRegExp("[^0-9A-Za-z.]"),"_");
@@ -55,3 +55,3 @@ static QString safeFileName(const QString& n)
if ( safename.isEmpty() )
- safename = "_";
+ safename = "_";
return safename;
@@ -62,6 +62,6 @@ static bool prepareDirectories(const QString& lf)
if ( !QFile::exists(lf) ) {
- // May need to create directories
- QFileInfo fi(lf);
- if ( system(("mkdir -p "+fi.dirPath(TRUE))) )
- return FALSE;
+ // May need to create directories
+ QFileInfo fi(lf);
+ if ( system(("mkdir -p "+fi.dirPath(TRUE))) )
+ return FALSE;
}
@@ -89,5 +89,5 @@ public:
{
- Categories cat( 0 );
- cat.load( categoryFileName() );
- // we need to update the names for the mCat... to mCatList
+ Categories cat( 0 );
+ cat.load( categoryFileName() );
+ // we need to update the names for the mCat... to mCatList
mCatList.clear();
@@ -100,3 +100,3 @@ public:
{
- mCat.resize(0);
+ mCat.resize(0);
}
@@ -105,22 +105,22 @@ public:
{
- if ( mCat.count() > 0 || mCatList.count()==0 )
- return;
-
- Categories cat( 0 );
- cat.load( categoryFileName() );
- mCat.resize( mCatList.count() );
- int i;
- QStringList::ConstIterator it;
- for ( i = 0, it = mCatList.begin(); it != mCatList.end();
- ++it, i++ ) {
-
- bool number;
- int id = (*it).toInt( &number );
- if ( !number ) {
- id = cat.id( "Document View", *it );
- if ( id == 0 )
- id = cat.addCategory( "Document View", *it );
- }
- mCat[i] = id;
- }
+ if ( mCat.count() > 0 || mCatList.count()==0 )
+ return;
+
+ Categories cat( 0 );
+ cat.load( categoryFileName() );
+ mCat.resize( mCatList.count() );
+ int i;
+ QStringList::ConstIterator it;
+ for ( i = 0, it = mCatList.begin(); it != mCatList.end();
+ ++it, i++ ) {
+
+ bool number;
+ int id = (*it).toInt( &number );
+ if ( !number ) {
+ id = cat.id( "Document View", *it );
+ if ( id == 0 )
+ id = cat.addCategory( "Document View", *it );
+ }
+ mCat[i] = id;
+ }
}
@@ -188,19 +188,19 @@ public:
\header \i Get Function \i Set Function \i Short Description
- \row \i \l name() \i \l setName() \i application's name
- \row \i \l pixmap() \i \e none \i application's icon
- \row \i \l bigPixmap() \i \e none \i application's large icon
- \row \i \e none \i setIcon() \i sets the icon's filename
- \row \i \l type() \i \l setType() \i see \link #Types Types\endlink above
- \row \i \l rotation() \i \e none \i 0, 90, 180 or 270 degrees
+ \row \i \l name() \i \l setName() \i application's name
+ \row \i \l pixmap() \i \e none \i application's icon
+ \row \i \l bigPixmap() \i \e none \i application's large icon
+ \row \i \e none \i setIcon() \i sets the icon's filename
+ \row \i \l type() \i \l setType() \i see \link #Types Types\endlink above
+ \row \i \l rotation() \i \e none \i 0, 90, 180 or 270 degrees
\row \i \l comment() \i \l setComment() \i text for the Details dialog
- \row \i \l exec() \i \l setExec() \i executable's filename
- \row \i \l file() \i \e none \i document's filename
- \row \i \l linkFile() \i \l setLinkFile() \i \e .desktop filename
- \row \i \l mimeTypes() \i \e none \i the mime types the application can view or edit
- \row \i \l categories() \i \l setCategories() \i \e{see the function descriptions}
- \row \i \l fileKnown() \i \e none \i see \link
+ \row \i \l exec() \i \l setExec() \i executable's filename
+ \row \i \l file() \i \e none \i document's filename
+ \row \i \l linkFile() \i \l setLinkFile() \i \e .desktop filename
+ \row \i \l mimeTypes() \i \e none \i the mime types the application can view or edit
+ \row \i \l categories() \i \l setCategories() \i \e{see the function descriptions}
+ \row \i \l fileKnown() \i \e none \i see \link
#files-and-links Files and Links\endlink above
- \row \i \l linkFileKnown() \i \e none \i see \link
+ \row \i \l linkFileKnown() \i \e none \i see \link
#files-and-links Files and Links\endlink above
- \row \i \l property() \i \l setProperty() \i any AppLnk property
+ \row \i \l property() \i \l setProperty() \i any AppLnk property
can be retrieved or set (if writeable) using these
@@ -372,52 +372,52 @@ AppLnk::AppLnk( const QString &file )
if ( !file.isNull() ) {
- Config config( file, Config::File );
-
- if ( config.isValid() ) {
- config.setGroup( "Desktop Entry" );
-
- mName = config.readEntry( "Name", file );
- mExec = config.readEntry( "Exec" );
- mType = config.readEntry( "Type", QString::null );
- mIconFile = config.readEntry( "Icon", QString::null );
- mRotation = config.readEntry( "Rotation", "" );
- mComment = config.readEntry( "Comment", QString::null );
- // MIME types are case-insensitive.
- mMimeTypes = config.readListEntry( "MimeType", ';' );
- for (QStringList::Iterator it=mMimeTypes.begin(); it!=mMimeTypes.end(); ++it)
- *it = (*it).lower();
- mMimeTypeIcons = config.readListEntry( "MimeTypeIcons", ';' );
- mLinkFile = file;
- mFile = config.readEntry("File", QString::null);
- if ( !mExec. isEmpty ( )) {
- mFile = QString::null;
- }
- else if ( mFile[0] != '/' ) {
- int slash = file.findRev('/');
- if ( slash >= 0 ) {
- mFile = file.left(slash) + '/' + mFile;
- }
- }
- d->mCatList = config.readListEntry("Categories", ';');
- if ( d->mCatList[0].toInt() < -1 ) {
- // numeric cats in file! convert to text
- Categories cat( 0 );
- cat.load( categoryFileName() );
- d->mCat.resize( d->mCatList.count() );
- int i;
- QStringList::ConstIterator it;
- for ( i = 0, it = d->mCatList.begin(); it != d->mCatList.end();
- ++it, i++ ) {
- bool number;
- int id = (*it).toInt( &number );
- if ( !number ) {
- // convert from text
- id = cat.id( "Document View", *it );
- if ( id == 0 )
- id = cat.addCategory( "Document View", *it );
- }
- d->mCat[i] = id;
- }
- d->updateCatListFromArray();
- }
- }
+ Config config( file, Config::File );
+
+ if ( config.isValid() ) {
+ config.setGroup( "Desktop Entry" );
+
+ mName = config.readEntry( "Name", file );
+ mExec = config.readEntry( "Exec" );
+ mType = config.readEntry( "Type", QString::null );
+ mIconFile = config.readEntry( "Icon", QString::null );
+ mRotation = config.readEntry( "Rotation", "" );
+ mComment = config.readEntry( "Comment", QString::null );
+ // MIME types are case-insensitive.
+ mMimeTypes = config.readListEntry( "MimeType", ';' );
+ for (QStringList::Iterator it=mMimeTypes.begin(); it!=mMimeTypes.end(); ++it)
+ *it = (*it).lower();
+ mMimeTypeIcons = config.readListEntry( "MimeTypeIcons", ';' );
+ mLinkFile = file;
+ mFile = config.readEntry("File", QString::null);
+ if ( !mExec. isEmpty ( )) {
+ mFile = QString::null;
+ }
+ else if ( mFile[0] != '/' ) {
+ int slash = file.findRev('/');
+ if ( slash >= 0 ) {
+ mFile = file.left(slash) + '/' + mFile;
+ }
+ }
+ d->mCatList = config.readListEntry("Categories", ';');
+ if ( d->mCatList[0].toInt() < -1 ) {
+ // numeric cats in file! convert to text
+ Categories cat( 0 );
+ cat.load( categoryFileName() );
+ d->mCat.resize( d->mCatList.count() );
+ int i;
+ QStringList::ConstIterator it;
+ for ( i = 0, it = d->mCatList.begin(); it != d->mCatList.end();
+ ++it, i++ ) {
+ bool number;
+ int id = (*it).toInt( &number );
+ if ( !number ) {
+ // convert from text
+ id = cat.id( "Document View", *it );
+ if ( id == 0 )
+ id = cat.addCategory( "Document View", *it );
+ }
+ d->mCat[i] = id;
+ }
+ d->updateCatListFromArray();
+ }
+ }
}
@@ -430,5 +430,5 @@ AppLnk& AppLnk::operator=(const AppLnk &copy)
if ( mId )
- qWarning("Deleting AppLnk that is in an AppLnkSet");
+ qWarning("Deleting AppLnk that is in an AppLnkSet");
if ( d )
- delete d;
+ delete d;
@@ -465,23 +465,23 @@ const QPixmap& AppLnk::pixmap( int pos, int size ) const {
if ( d->mPixmaps[pos].isNull() ) {
- AppLnk* that = (AppLnk*)this;
- if ( mIconFile.isEmpty() ) {
- MimeType mt(type());
- that->d->mPixmaps[pos] = mt.pixmap();
- if ( that->d->mPixmaps[pos].isNull() )
- that->d->mPixmaps[pos].convertFromImage(
- Resource::loadImage("UnknownDocument")
- .smoothScale( size, size ) );
- return that->d->mPixmaps[pos];
- }
- QImage unscaledIcon = Resource::loadImage( that->mIconFile );
- if ( unscaledIcon.isNull() ) {
- qDebug( "Cannot find icon: %s", that->mIconFile.latin1() );
- that->d->mPixmaps[pos].convertFromImage(
- Resource::loadImage("UnknownDocument")
- .smoothScale( size, size ) );
- } else {
- that->d->mPixmaps[0].convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
- that->d->mPixmaps[1].convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
- }
- return that->d->mPixmaps[pos];
+ AppLnk* that = (AppLnk*)this;
+ if ( mIconFile.isEmpty() ) {
+ MimeType mt(type());
+ that->d->mPixmaps[pos] = mt.pixmap();
+ if ( that->d->mPixmaps[pos].isNull() )
+ that->d->mPixmaps[pos].convertFromImage(
+ Resource::loadImage("UnknownDocument")
+ .smoothScale( size, size ) );
+ return that->d->mPixmaps[pos];
+ }
+ QImage unscaledIcon = Resource::loadImage( that->mIconFile );
+ if ( unscaledIcon.isNull() ) {
+ // qDebug( "Cannot find icon: %s", that->mIconFile.latin1() );
+ that->d->mPixmaps[pos].convertFromImage(
+ Resource::loadImage("UnknownDocument")
+ .smoothScale( size, size ) );
+ } else {
+ that->d->mPixmaps[0].convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
+ that->d->mPixmaps[1].convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
+ }
+ return that->d->mPixmaps[pos];
}
@@ -524,9 +524,9 @@ QString AppLnk::type() const
if ( mType.isNull() ) {
- AppLnk* that = (AppLnk*)this;
- QString f = file();
- if ( !f.isNull() ) {
- MimeType mt(f);
- that->mType = mt.id();
- return that->mType;
- }
+ AppLnk* that = (AppLnk*)this;
+ QString f = file();
+ if ( !f.isNull() ) {
+ MimeType mt(f);
+ that->mType = mt.id();
+ return that->mType;
+ }
}
@@ -543,14 +543,14 @@ QString AppLnk::file() const
if ( mExec.isEmpty ( ) && mFile.isNull() ) {
- AppLnk* that = (AppLnk*)this;
- QString ext = MimeType(mType).extension();
- if ( !ext.isEmpty() )
- ext = "." + ext;
- if ( !mLinkFile.isEmpty() ) {
- that->mFile =
- mLinkFile.right(8)==".desktop" // 8 = strlen(".desktop")
- ? mLinkFile.left(mLinkFile.length()-8) : mLinkFile;
- qDebug("mFile now == %s", mFile.latin1());
- } else if ( mType.contains('/') ) {
- that->mFile =
- QString(getenv("HOME"))+"/Documents/"+mType+"/"+safeFileName(that->mName);
+ AppLnk* that = (AppLnk*)this;
+ QString ext = MimeType(mType).extension();
+ if ( !ext.isEmpty() )
+ ext = "." + ext;
+ if ( !mLinkFile.isEmpty() ) {
+ that->mFile =
+ mLinkFile.right(8)==".desktop" // 8 = strlen(".desktop")
+ ? mLinkFile.left(mLinkFile.length()-8) : mLinkFile;
+ qDebug("mFile now == %s", mFile.latin1());
+ } else if ( mType.contains('/') ) {
+ that->mFile =
+ QString(getenv("HOME"))+"/Documents/"+mType+"/"+safeFileName(that->mName);
/*
@@ -558,20 +558,20 @@ QString AppLnk::file() const
*/
- if ( QFile::exists(that->mFile+ext) || QFile::exists(that->mFile+".desktop") ) {
- int n=1;
- QString nn;
- while (QFile::exists((nn=(that->mFile+"_"+QString::number(n)))+ext)
- || QFile::exists(nn+".desktop"))
- n++;
- that->mFile = nn;
- }
- that->mLinkFile = that->mFile+".desktop";
- that->mFile += ext;
- }
- prepareDirectories(that->mFile);
- if ( !that->mFile.isEmpty() ) {
- QFile f(that->mFile);
- if ( !f.open(IO_WriteOnly) )
- that->mFile = QString::null;
- return that->mFile;
- }
+ if ( QFile::exists(that->mFile+ext) || QFile::exists(that->mFile+".desktop") ) {
+ int n=1;
+ QString nn;
+ while (QFile::exists((nn=(that->mFile+"_"+QString::number(n)))+ext)
+ || QFile::exists(nn+".desktop"))
+ n++;
+ that->mFile = nn;
+ }
+ that->mLinkFile = that->mFile+".desktop";
+ that->mFile += ext;
+ }
+ prepareDirectories(that->mFile);
+ if ( !that->mFile.isEmpty() ) {
+ QFile f(that->mFile);
+ if ( !f.open(IO_WriteOnly) )
+ that->mFile = QString::null;
+ return that->mFile;
+ }
}
@@ -588,6 +588,6 @@ QString AppLnk::linkFile() const
if ( mLinkFile.isNull() ) {
- AppLnk* that = (AppLnk*)this;
- if ( type().contains('/') ) {
- StorageInfo storage;
- const FileSystem *fs = storage.fileSystemOf( that->mFile );
+ AppLnk* that = (AppLnk*)this;
+ if ( type().contains('/') ) {
+ StorageInfo storage;
+ const FileSystem *fs = storage.fileSystemOf( that->mFile );
/* tmpfs + and ramfs are available too but not removable
@@ -595,10 +595,10 @@ QString AppLnk::linkFile() const
*/
- if ( fs && ( fs->isRemovable() || fs->disk() == "/dev/mtdblock6" || fs->disk() == "tmpfs") ) {
- that->mLinkFile = fs->path();
- } else
- that->mLinkFile = getenv( "HOME" );
- that->mLinkFile += "/Documents/"+type()+"/"+safeFileName(that->mName);
+ if ( fs && ( fs->isRemovable() || fs->disk() == "/dev/mtdblock6" || fs->disk() == "tmpfs") ) {
+ that->mLinkFile = fs->path();
+ } else
+ that->mLinkFile = getenv( "HOME" );
+ that->mLinkFile += "/Documents/"+type()+"/"+safeFileName(that->mName);
/* the desktop file exists make sure we don't point to the same file */
- if ( QFile::exists(that->mLinkFile+".desktop") ) {
+ if ( QFile::exists(that->mLinkFile+".desktop") ) {
AppLnk lnk( that->mLinkFile + ".desktop" );
@@ -618,7 +618,7 @@ QString AppLnk::linkFile() const
}
- }
- that->mLinkFile += ".desktop";
- storeLink();
- }
- return that->mLinkFile;
+ }
+ that->mLinkFile += ".desktop";
+ storeLink();
+ }
+ return that->mLinkFile;
}
@@ -660,5 +660,5 @@ AppLnk::~AppLnk()
if ( mId )
- qWarning("Deleting AppLnk that is in an AppLnkSet");
+ qWarning("Deleting AppLnk that is in an AppLnkSet");
if ( d )
- delete d;
+ delete d;
}
@@ -686,12 +686,12 @@ void AppLnk::execute(const QStringList& args) const
if ( !mRotation.isEmpty() ) {
- // ######## this will only work in the server
- int rot = QPEApplication::defaultRotation();
- rot = (rot+mRotation.toInt())%360;
- QCString old = getenv("QWS_DISPLAY");
- setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
- invoke(args);
- setenv("QWS_DISPLAY", old.data(), 1);
+ // ######## this will only work in the server
+ int rot = QPEApplication::defaultRotation();
+ rot = (rot+mRotation.toInt())%360;
+ QCString old = getenv("QWS_DISPLAY");
+ setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
+ invoke(args);
+ setenv("QWS_DISPLAY", old.data(), 1);
} else
#endif
- invoke(args);
+ invoke(args);
}
@@ -728,3 +728,3 @@ void AppLnk::setRotation ( const QString &rot )
{
- mRotation = rot;
+ mRotation = rot;
}
@@ -855,3 +855,3 @@ bool AppLnk::writeLink() const
if ( !ensureLinkExists() )
- return FALSE;
+ return FALSE;
storeLink();
@@ -871,5 +871,5 @@ void AppLnk::storeLink() const
if(!rotation().isEmpty())
- config.writeEntry("Rotation",rotation());
+ config.writeEntry("Rotation",rotation());
else
- config.removeEntry("Rotation");
+ config.removeEntry("Rotation");
if ( !mComment.isNull() ) config.writeEntry("Comment",mComment);
@@ -878,8 +878,8 @@ void AppLnk::storeLink() const
while ( i < (int)f.length() && i < (int)mLinkFile.length() && f[i] == mLinkFile[i] )
- i++;
+ i++;
while ( i && f[i] != '/' )
- i--;
+ i--;
// simple case where in the same directory
if ( mLinkFile.find( '/', i + 1 ) < 0 )
- f = f.mid(i+1);
+ f = f.mid(i+1);
// ### could do relative ie ../../otherDocs/file.doc
@@ -902,4 +902,4 @@ void AppLnk::setProperty(const QString& key, const QString& value)
if ( ensureLinkExists() ) {
- Config cfg(linkFile(), Config::File);
- cfg.writeEntry(key,value);
+ Config cfg(linkFile(), Config::File);
+ cfg.writeEntry(key,value);
}
@@ -916,3 +916,3 @@ QString AppLnk::property(const QString& key) const
if ( !QFile::exists(lf) )
- return QString::null;
+ return QString::null;
Config cfg(lf, Config::File);
@@ -953,14 +953,14 @@ void AppLnk::removeFiles()
if ( !valid || !linkFileKnown() || QFile::remove(linkFile()) ) {
- if ( QFile::remove(file()) ) {
+ if ( QFile::remove(file()) ) {
#ifndef QT_NO_COP
- QCopEnvelope e("QPE/System", "linkChanged(QString)");
- if ( linkFileKnown() )
- e << linkFile();
- else
- e << file();
+ QCopEnvelope e("QPE/System", "linkChanged(QString)");
+ if ( linkFileKnown() )
+ e << linkFile();
+ else
+ e << file();
#endif
- } else if ( valid ) {
- // restore link
- writeLink();
- }
+ } else if ( valid ) {
+ // restore link
+ writeLink();
+ }
}
@@ -977,4 +977,4 @@ void AppLnk::removeLinkFile()
#ifndef QT_NO_COP
- QCopEnvelope e("QPE/System", "linkChanged(QString)");
- e << linkFile();
+ QCopEnvelope e("QPE/System", "linkChanged(QString)");
+ e << linkFile();
#endif
@@ -987,5 +987,5 @@ public:
{
- typPix.setAutoDelete(TRUE);
- typPixBig.setAutoDelete(TRUE);
- typName.setAutoDelete(TRUE);
+ typPix.setAutoDelete(TRUE);
+ typPixBig.setAutoDelete(TRUE);
+ typName.setAutoDelete(TRUE);
}
@@ -1054,5 +1054,5 @@ void AppLnkSet::detachChildren()
for ( ; it.current(); ) {
- AppLnk* a = *it;
- ++it;
- a->mId = 0;
+ AppLnk* a = *it;
+ ++it;
+ a->mId = 0;
}
@@ -1070,6 +1070,6 @@ AppLnkSet::~AppLnkSet()
for ( ; it.current(); ) {
- AppLnk* a = *it;
- ++it;
- a->mId = 0;
- delete a;
+ AppLnk* a = *it;
+ ++it;
+ a->mId = 0;
+ delete a;
}
@@ -1082,3 +1082,3 @@ void AppLnkSet::findChildren(const QString &dr, const QString& typ, const QStrin
if ( depth > 10 )
- return;
+ return;
@@ -1088,15 +1088,15 @@ void AppLnkSet::findChildren(const QString &dr, const QString& typ, const QStrin
if ( dir.exists( ".directory" ) ) {
- Config config( dr + "/.directory", Config::File );
- config.setGroup( "Desktop Entry" );
- typNameLocal = config.readEntry( "Name", typNameLocal );
- if ( !typ.isEmpty() ) {
- QString iconFile = config.readEntry( "Icon", "AppsIcon" );
- QImage unscaledIcon = Resource::loadImage( iconFile );
- QPixmap pm, bpm;
- pm.convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
- bpm.convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
- d->typPix.insert(typ, new QPixmap(pm));
- d->typPixBig.insert(typ, new QPixmap(bpm));
- d->typName.insert(typ, new QString(typNameLocal));
- }
+ Config config( dr + "/.directory", Config::File );
+ config.setGroup( "Desktop Entry" );
+ typNameLocal = config.readEntry( "Name", typNameLocal );
+ if ( !typ.isEmpty() ) {
+ QString iconFile = config.readEntry( "Icon", "AppsIcon" );
+ QImage unscaledIcon = Resource::loadImage( iconFile );
+ QPixmap pm, bpm;
+ pm.convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
+ bpm.convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
+ d->typPix.insert(typ, new QPixmap(pm));
+ d->typPixBig.insert(typ, new QPixmap(bpm));
+ d->typName.insert(typ, new QString(typNameLocal));
+ }
}
@@ -1105,33 +1105,34 @@ void AppLnkSet::findChildren(const QString &dr, const QString& typ, const QStrin
if ( list ) {
- QFileInfo* fi;
- bool cadded=FALSE;
- for ( QFileInfoListIterator it(*list); (fi=*it); ++it ) {
- QString bn = fi->fileName();
- if ( bn[0] != '.' && bn != "CVS" ) {
- if ( fi->isDir() ) {
- QString c = typ.isNull() ? bn : typ+"/"+bn;
- QString d = typNameLocal.isNull() ? bn : typNameLocal+"/"+bn;
- findChildren(fi->filePath(), c, d, depth );
- } else {
- if ( fi->extension(FALSE) == "desktop" ) {
- AppLnk* app = new AppLnk( fi->filePath() );
+ QFileInfo* fi;
+ bool cadded=FALSE;
+ for ( QFileInfoListIterator it(*list); (fi=*it); ++it ) {
+ QString bn = fi->fileName();
+// qDebug("findChildren "+bn);
+ if ( bn[0] != '.' && bn != "CVS" ) {
+ if ( fi->isDir() ) {
+ QString c = typ.isNull() ? bn : typ+"/"+bn;
+ QString d = typNameLocal.isNull() ? bn : typNameLocal+"/"+bn;
+ findChildren(fi->filePath(), c, d, depth );
+ } else {
+ if ( fi->extension(FALSE) == "desktop" ) {
+ AppLnk* app = new AppLnk( fi->filePath() );
#ifdef QT_NO_QWS_MULTIPROCESS
- if ( !Global::isBuiltinCommand( app->exec() ) )
- delete app;
- else
+ if ( !Global::isBuiltinCommand( app->exec() ) )
+ delete app;
+ else
#endif
- {
- if ( !typ.isEmpty() ) {
- if ( !cadded ) {
- typs.append(typ);
- cadded = TRUE;
- }
- app->setType(typ);
- }
- add(app);
- }
- }
- }
- }
- }
+ {
+ if ( !typ.isEmpty() ) {
+ if ( !cadded ) {
+ typs.append(typ);
+ cadded = TRUE;
+ }
+ app->setType(typ);
+ }
+ add(app);
+ }
+ }
+ }
+ }
+ }
}
@@ -1148,7 +1149,7 @@ void AppLnkSet::add( AppLnk *f )
if ( f->mId == 0 ) {
- AppLnk::lastId++;
- f->mId = AppLnk::lastId;
- mApps.append( f );
+ AppLnk::lastId++;
+ f->mId = AppLnk::lastId;
+ mApps.append( f );
} else {
- qWarning("Attempt to add an AppLnk twice");
+ qWarning("Attempt to add an AppLnk twice");
}
@@ -1166,4 +1167,4 @@ bool AppLnkSet::remove( AppLnk *f )
if ( mApps.remove( f ) ) {
- f->mId = 0;
- return TRUE;
+ f->mId = 0;
+ return TRUE;
}
@@ -1217,5 +1218,5 @@ const AppLnk *AppLnkSet::find( int id ) const
for ( ; it.current(); ++it ) {
- const AppLnk *app = it.current();
- if ( app->id() == id )
- return app;
+ const AppLnk *app = it.current();
+ if ( app->id() == id )
+ return app;
}
@@ -1233,5 +1234,5 @@ const AppLnk *AppLnkSet::findExec( const QString& exec ) const
for ( ; it.current(); ++it ) {
- const AppLnk *app = it.current();
- if ( app->exec() == exec )
- return app;
+ const AppLnk *app = it.current();
+ if ( app->exec() == exec )
+ return app;
}
@@ -1283,3 +1284,3 @@ DocLnkSet::DocLnkSet( const QString &directory, const QString& mimefilter ) :
for( QStringList::Iterator it = subFilter.begin(); it != subFilter.end(); ++ it )
- mimeFilters.append( QRegExp(*it, FALSE, TRUE) );
+ mimeFilters.append( QRegExp(*it, FALSE, TRUE) );
@@ -1289,25 +1290,24 @@ DocLnkSet::DocLnkSet( const QString &directory, const QString& mimefilter ) :
for ( QListIterator<DocLnk> it( list ); it.current(); ++it ) {
- reference.remove( (*it)->file() );
+ reference.remove( (*it)->file() );
}
-
for ( QDictIterator<void> dit(reference); dit.current(); ++dit ) {
- if ( dit.current() == (void*)2 ) {
- // Unreferenced, make an unwritten link
- DocLnk* dl = new DocLnk;
- QFileInfo fi( dit.currentKey() );
- dl->setFile(fi.filePath());
- dl->setName(fi.baseName());
- // #### default to current path?
- // dl->setCategories( ... );
- bool match = mimefilter.isNull();
- if ( !match )
- for( QValueList<QRegExp>::Iterator it = mimeFilters.begin(); it != mimeFilters.end() && !match; ++ it )
- if ( (*it).match(dl->type()) >= 0 )
- match = TRUE;
- if ( match /* && dl->type() != "application/octet-stream" */
- && !!dl->exec() )
- add(dl);
- else
- delete dl;
- }
+ if ( dit.current() == (void*)2 ) {
+ // Unreferenced, make an unwritten link
+ DocLnk* dl = new DocLnk;
+ QFileInfo fi( dit.currentKey() );
+ dl->setFile(fi.filePath());
+ dl->setName(fi.baseName());
+ // #### default to current path?
+ // dl->setCategories( ... );
+ bool match = mimefilter.isNull();
+ if ( !match )
+ for( QValueList<QRegExp>::Iterator it = mimeFilters.begin(); it != mimeFilters.end() && !match; ++ it )
+ if ( (*it).match(dl->type()) >= 0 )
+ match = TRUE;
+ if ( match /* && dl->type() != "application/octet-stream" */
+ && !!dl->exec() )
+ add(dl);
+ else
+ delete dl;
+ }
}
@@ -1323,7 +1323,7 @@ void DocLnkSet::appendFrom( DocLnkSet& other )
if ( &other == this )
- return;
+ return;
QListIterator<AppLnk> it( other.mApps );
for ( ; it.current(); ) {
- mApps.append(*it);
- ++it;
+ mApps.append(*it);
+ ++it;
}
@@ -1336,3 +1336,3 @@ void DocLnkSet::findChildren(const QString &dr, const QValueList<QRegExp> &mimeF
if ( depth > 10 )
- return;
+ return;
@@ -1345,3 +1345,3 @@ void DocLnkSet::findChildren(const QString &dr, const QValueList<QRegExp> &mimeF
if ( dir.exists( ".Qtopia-ignore" ) )
- return;
+ return;
@@ -1349,37 +1349,37 @@ void DocLnkSet::findChildren(const QString &dr, const QValueList<QRegExp> &mimeF
if ( list ) {
- QFileInfo* fi;
- for ( QFileInfoListIterator it(*list); (fi=*it); ++it ) {
- QString bn = fi->fileName();
- if ( bn[0] != '.' ) {
- if ( fi->isDir() ) {
- if ( bn != "CVS" && bn != "Qtopia" && bn != "QtPalmtop" )
- findChildren(fi->filePath(), mimeFilters, reference, depth);
- } else {
- if ( fi->extension(FALSE) == "desktop" ) {
- DocLnk* dl = new DocLnk( fi->filePath() );
- QFileInfo fi2(dl->file());
- bool match = FALSE;
- if ( !fi2.exists() ) {
- dir.remove( dl->file() );
- }
- if ( mimeFilters.count() == 0 ) {
- add( dl );
- match = TRUE;
- } else {
- for( QValueList<QRegExp>::ConstIterator it = mimeFilters.begin(); it != mimeFilters.end(); ++ it ) {
- if ( (*it).match(dl->type()) >= 0 ) {
- add(dl);
- match = TRUE;
- }
- }
- }
- if ( !match )
- delete dl;
- } else {
- if ( !reference.find(fi->fileName()) )
- reference.insert(fi->filePath(), (void*)2);
- }
- }
- }
- }
+ QFileInfo* fi;
+ for ( QFileInfoListIterator it(*list); (fi=*it); ++it ) {
+ QString bn = fi->fileName();
+ if ( bn[0] != '.' ) {
+ if ( fi->isDir() ) {
+ if ( bn != "CVS" && bn != "Qtopia" && bn != "QtPalmtop" )
+ findChildren(fi->filePath(), mimeFilters, reference, depth);
+ } else {
+ if ( fi->extension(FALSE) == "desktop" ) {
+ DocLnk* dl = new DocLnk( fi->filePath() );
+ QFileInfo fi2(dl->file());
+ bool match = FALSE;
+ if ( !fi2.exists() ) {
+ dir.remove( dl->file() );
+ }
+ if ( mimeFilters.count() == 0 ) {
+ add( dl );
+ match = TRUE;
+ } else {
+ for( QValueList<QRegExp>::ConstIterator it = mimeFilters.begin(); it != mimeFilters.end(); ++ it ) {
+ if ( (*it).match(dl->type()) >= 0 ) {
+ add(dl);
+ match = TRUE;
+ }
+ }
+ }
+ if ( !match )
+ delete dl;
+ } else {
+ if ( !reference.find(fi->fileName()) )
+ reference.insert(fi->filePath(), (void*)2);
+ }
+ }
+ }
+ }
}
@@ -1424,23 +1424,23 @@ void DocLnk::init(const QString &file)
#ifndef FORCED_DIR_STRUCTURE_WAY
- if ( mType.isNull() )
- // try to infer it
+ if ( mType.isNull() )
+ // try to infer it
#endif
- {
- int s0 = file.findRev('/');
- if ( s0 > 0 ) {
- int s1 = file.findRev('/',s0-1);
- if ( s1 > 0 ) {
- int s2 = file.findRev('/',s1-1);
- if ( s2 > 0 ) {
- mType = file.mid(s2+1,s0-s2-1);
- }
- }
- }
- }
+ {
+ int s0 = file.findRev('/');
+ if ( s0 > 0 ) {
+ int s1 = file.findRev('/',s0-1);
+ if ( s1 > 0 ) {
+ int s2 = file.findRev('/',s1-1);
+ if ( s2 > 0 ) {
+ mType = file.mid(s2+1,s0-s2-1);
+ }
+ }
+ }
+ }
} else if ( QFile::exists(file) ) {
- QString n = file;
- n.replace(QRegExp(".*/"),"");
- n.replace(QRegExp("\\..*"),"");
- setName( n );
- setFile( file );
+ QString n = file;
+ n.replace(QRegExp(".*/"),"");
+ n.replace(QRegExp("\\..*"),"");
+ setName( n );
+ setFile( file );
}
@@ -1448,3 +1448,3 @@ void DocLnk::init(const QString &file)
if( mt.application() )
- mExec = mt.application()->exec();
+ mExec = mt.application()->exec();
}
@@ -1474,5 +1474,5 @@ QString DocLnk::exec() const
if ( app )
- return app->exec();
+ return app->exec();
else
- return QString::null;
+ return QString::null;
}
@@ -1487,8 +1487,8 @@ void DocLnk::invoke(const QStringList& args) const
if ( app ) {
- QStringList a = args;
- if ( linkFileKnown() && QFile::exists( linkFile() ) )
- a.append(linkFile());
- else
- a.append(file());
- app->execute(a);
+ QStringList a = args;
+ if ( linkFileKnown() && QFile::exists( linkFile() ) )
+ a.append(linkFile());
+ else
+ a.append(file());
+ app->execute(a);
}