diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-07 19:10:38 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-07 19:10:38 -0600 |
commit | 99cc03399059853dd8699cae5752e8122cb715f1 (patch) | |
tree | 825da375ac05fc555e25b2e350504e211d85d2fb /kio/tests/kurifiltertest.cpp | |
parent | d5b3ae721dc072e0c70055313de9b5228b6688a8 (diff) | |
download | tdelibs-99cc03399059853dd8699cae5752e8122cb715f1.tar.gz tdelibs-99cc03399059853dd8699cae5752e8122cb715f1.zip |
Rename KDEHOME and KDEDIR
Diffstat (limited to 'kio/tests/kurifiltertest.cpp')
-rw-r--r-- | kio/tests/kurifiltertest.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp index 9f4477e5e..4e9f9ad2d 100644 --- a/kio/tests/kurifiltertest.cpp +++ b/kio/tests/kurifiltertest.cpp @@ -154,8 +154,8 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { // Ensure that user configuration doesn't change the results of those tests - // KDEHOME needs to be writable though, for a ksycoca database - setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-kurifiltertest" ), true ); + // TDEHOME needs to be writable though, for a ksycoca database + setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-kurifiltertest" ), true ); setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup KAboutData aboutData(appName, programName, version, description); @@ -214,7 +214,7 @@ int main(int argc, char **argv) // ShortURI/LocalDomain filter tests. NOTE: any of these tests can fail // if you have specified your own patterns in kshorturifilterrc. For - // examples, see $KDEDIR/share/config/kshorturifilterrc . + // examples, see $TDEDIR/share/config/kshorturifilterrc . filter( "linuxtoday.com", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL ); filter( "LINUXTODAY.COM", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL ); filter( "kde.org", "http://kde.org", KURIFilterData::NET_PROTOCOL ); @@ -290,7 +290,7 @@ int main(int argc, char **argv) TQCString qtdir=getenv("QTDIR"); TQCString home = getenv("HOME"); - TQCString kdehome = getenv("KDEHOME"); + TQCString kdehome = getenv("TDEHOME"); filter( "$SOMEVAR/tdelibs/kio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist... filter( "$ETC/passwd", "/etc/passwd", KURIFilterData::LOCAL_FILE ); @@ -301,31 +301,31 @@ int main(int argc, char **argv) if (kdehome.isEmpty()) { kdehome += "$HOME/.kde"; - setenv("KDEHOME", kdehome.data(), 0); + setenv("TDEHOME", kdehome.data(), 0); } - filter( "$KDEHOME/share", kdehome+"/share", KURIFilterData::LOCAL_DIR ); + filter( "$TDEHOME/share", kdehome+"/share", KURIFilterData::LOCAL_DIR ); KStandardDirs::makeDir( kdehome+"/a+plus" ); - filter( "$KDEHOME/a+plus", kdehome+"/a+plus", KURIFilterData::LOCAL_DIR ); + filter( "$TDEHOME/a+plus", kdehome+"/a+plus", KURIFilterData::LOCAL_DIR ); // BR 27788 KStandardDirs::makeDir( kdehome+"/share/Dir With Space" ); - filter( "$KDEHOME/share/Dir With Space", kdehome+"/share/Dir With Space", KURIFilterData::LOCAL_DIR ); + filter( "$TDEHOME/share/Dir With Space", kdehome+"/share/Dir With Space", KURIFilterData::LOCAL_DIR ); // support for name filters (BR 93825) - filter( "$KDEHOME/*.txt", kdehome+"/*.txt", KURIFilterData::LOCAL_DIR ); - filter( "$KDEHOME/[a-b]*.txt", kdehome+"/[a-b]*.txt", KURIFilterData::LOCAL_DIR ); - filter( "$KDEHOME/a?c.txt", kdehome+"/a?c.txt", KURIFilterData::LOCAL_DIR ); - filter( "$KDEHOME/?c.txt", kdehome+"/?c.txt", KURIFilterData::LOCAL_DIR ); + filter( "$TDEHOME/*.txt", kdehome+"/*.txt", KURIFilterData::LOCAL_DIR ); + filter( "$TDEHOME/[a-b]*.txt", kdehome+"/[a-b]*.txt", KURIFilterData::LOCAL_DIR ); + filter( "$TDEHOME/a?c.txt", kdehome+"/a?c.txt", KURIFilterData::LOCAL_DIR ); + filter( "$TDEHOME/?c.txt", kdehome+"/?c.txt", KURIFilterData::LOCAL_DIR ); // but let's check that a directory with * in the name still works KStandardDirs::makeDir( kdehome+"/share/Dir*With*Stars" ); - filter( "$KDEHOME/share/Dir*With*Stars", kdehome+"/share/Dir*With*Stars", KURIFilterData::LOCAL_DIR ); + filter( "$TDEHOME/share/Dir*With*Stars", kdehome+"/share/Dir*With*Stars", KURIFilterData::LOCAL_DIR ); KStandardDirs::makeDir( kdehome+"/share/Dir?QuestionMark" ); - filter( "$KDEHOME/share/Dir?QuestionMark", kdehome+"/share/Dir?QuestionMark", KURIFilterData::LOCAL_DIR ); + filter( "$TDEHOME/share/Dir?QuestionMark", kdehome+"/share/Dir?QuestionMark", KURIFilterData::LOCAL_DIR ); KStandardDirs::makeDir( kdehome+"/share/Dir[Bracket" ); - filter( "$KDEHOME/share/Dir[Bracket", kdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR ); + filter( "$TDEHOME/share/Dir[Bracket", kdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR ); - filter( "$HOME/$KDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR ); + filter( "$HOME/$TDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR ); filter( "$1/$2/$3", "http://www.google.com/search?q=$1/$2/$3&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); // can be used as bogus or valid test. Currently triggers default search, i.e. google filter( "$$$$", "http://www.google.com/search?q=$$$$&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); // worst case scenarios. |