diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-17 22:17:08 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-17 22:17:08 +0000 |
commit | f138d74fe16092003b06f5bde9663841929cde7f (patch) | |
tree | e9c497a0e59bc7d34264ac9404740d2ea76f3de4 /kttsd/plugins/hadifix/initialconfig.h | |
parent | 3a3c4b256baee79bdcfe72c5e01b9ded9b525900 (diff) | |
download | tdeaccessibility-f138d74fe16092003b06f5bde9663841929cde7f.tar.gz tdeaccessibility-f138d74fe16092003b06f5bde9663841929cde7f.zip |
TQt4 port kdeaccessibility
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1237325 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kttsd/plugins/hadifix/initialconfig.h')
-rw-r--r-- | kttsd/plugins/hadifix/initialconfig.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kttsd/plugins/hadifix/initialconfig.h b/kttsd/plugins/hadifix/initialconfig.h index 02e920c..62ff659 100644 --- a/kttsd/plugins/hadifix/initialconfig.h +++ b/kttsd/plugins/hadifix/initialconfig.h @@ -71,7 +71,7 @@ TQString findExecutable (const TQStringList &names, const TQString &possiblePath } // Both tries failed, so the user has to locate the executable. - return TQString::null; + return TQString(); } /** Tries to find the voice files by looking onto the hard disk. */ @@ -100,7 +100,7 @@ TQStringList findVoices(TQString mbrolaExec, const TQString &hadifixDataPath) { // 2b) search near the hadifix data path info.setFile(hadifixDataPath + "../../mbrola"); TQString mbrolaPath = info.dirPath (true) + "/mbrola"; - if (!list.contains(mbrolaPath)) + if (!list.tqcontains(mbrolaPath)) list += mbrolaPath; // 2c) broaden the search by adding subdirs (with a depth of 2) @@ -114,7 +114,7 @@ TQStringList findVoices(TQString mbrolaExec, const TQString &hadifixDataPath) { TQStringList result; TQStringList::iterator it; for (it = list.begin(); it != list.end(); ++it) { - TQDir baseDir (*it, TQString::null, + TQDir baseDir (*it, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Files); TQStringList files = baseDir.entryList(); @@ -148,7 +148,7 @@ TQStringList findSubdirs (const TQStringList &baseDirs) { TQStringList::ConstIterator itEnd = baseDirs.constEnd(); for (it = baseDirs.constBegin(); it != itEnd; ++it) { // a) get a list of directory names - TQDir baseDir (*it, TQString::null, + TQDir baseDir (*it, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs); TQStringList list = baseDir.entryList(); |