From d3afa6baf98ef5ac191996cc9b909ff9074c168c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 13:28:26 -0600 Subject: Rename KStandard for enhanced compatibility with KDE4 --- tdeio/tests/kurifiltertest.cpp | 10 +++++----- tdeio/tests/tdesycocatest.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tdeio/tests') diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp index 473ba6840..8e9785c24 100644 --- a/tdeio/tests/kurifiltertest.cpp +++ b/tdeio/tests/kurifiltertest.cpp @@ -305,11 +305,11 @@ int main(int argc, char **argv) } filter( "$TDEHOME/share", tdehome+"/share", KURIFilterData::LOCAL_DIR ); - KStandardDirs::makeDir( tdehome+"/a+plus" ); + TDEStandardDirs::makeDir( tdehome+"/a+plus" ); filter( "$TDEHOME/a+plus", tdehome+"/a+plus", KURIFilterData::LOCAL_DIR ); // BR 27788 - KStandardDirs::makeDir( tdehome+"/share/Dir With Space" ); + TDEStandardDirs::makeDir( tdehome+"/share/Dir With Space" ); filter( "$TDEHOME/share/Dir With Space", tdehome+"/share/Dir With Space", KURIFilterData::LOCAL_DIR ); // support for name filters (BR 93825) @@ -318,11 +318,11 @@ int main(int argc, char **argv) filter( "$TDEHOME/a?c.txt", tdehome+"/a?c.txt", KURIFilterData::LOCAL_DIR ); filter( "$TDEHOME/?c.txt", tdehome+"/?c.txt", KURIFilterData::LOCAL_DIR ); // but let's check that a directory with * in the name still works - KStandardDirs::makeDir( tdehome+"/share/Dir*With*Stars" ); + TDEStandardDirs::makeDir( tdehome+"/share/Dir*With*Stars" ); filter( "$TDEHOME/share/Dir*With*Stars", tdehome+"/share/Dir*With*Stars", KURIFilterData::LOCAL_DIR ); - KStandardDirs::makeDir( tdehome+"/share/Dir?QuestionMark" ); + TDEStandardDirs::makeDir( tdehome+"/share/Dir?QuestionMark" ); filter( "$TDEHOME/share/Dir?QuestionMark", tdehome+"/share/Dir?QuestionMark", KURIFilterData::LOCAL_DIR ); - KStandardDirs::makeDir( tdehome+"/share/Dir[Bracket" ); + TDEStandardDirs::makeDir( tdehome+"/share/Dir[Bracket" ); filter( "$TDEHOME/share/Dir[Bracket", tdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR ); filter( "$HOME/$TDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR ); diff --git a/tdeio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp index 45f94ac3c..7166f3e35 100644 --- a/tdeio/tests/tdesycocatest.cpp +++ b/tdeio/tests/tdesycocatest.cpp @@ -194,7 +194,7 @@ int main(int argc, char *argv[]) // debug("\nTrying findByURL for $TDEDIR/bin/kdesktop"); - KMimeType::Ptr mf = KMimeType::findByURL( KStandardDirs::findExe( "kdesktop" ), 0, + KMimeType::Ptr mf = KMimeType::findByURL( TDEStandardDirs::findExe( "kdesktop" ), 0, true, false ); assert( mf ); check( "A binary's mimetype", mf->name(), "application/x-executable" ); -- cgit v1.2.1