summaryrefslogtreecommitdiffstats
path: root/konqueror/keditbookmarks/kbookmarkmerger.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
commitc663b6440964f6ac48027143ac9e63298991f9d0 (patch)
tree6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /konqueror/keditbookmarks/kbookmarkmerger.cpp
parenta061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff)
downloadtdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz
tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konqueror/keditbookmarks/kbookmarkmerger.cpp')
-rw-r--r--konqueror/keditbookmarks/kbookmarkmerger.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp
index f1e4ad741..d34794fdc 100644
--- a/konqueror/keditbookmarks/kbookmarkmerger.cpp
+++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp
@@ -31,9 +31,9 @@
#include <dcopclient.h>
-#include <qdir.h>
-#include <qdom.h>
-#include <qfile.h>
+#include <tqdir.h>
+#include <tqdom.h>
+#include <tqfile.h>
#include <X11/Xlib.h>
@@ -82,7 +82,7 @@ int main( int argc, char**argv )
}
KBookmarkManager *konqBookmarks = KBookmarkManager::userBookmarksManager();
- QStringList mergedFiles;
+ TQStringList mergedFiles;
{
KBookmarkGroup root = konqBookmarks->root();
for ( KBookmark bm = root.first(); !bm.isNull(); bm = root.next( bm ) ) {
@@ -90,7 +90,7 @@ int main( int argc, char**argv )
continue;
}
- QString mergedFrom = bm.metaDataItem( "merged_from" );
+ TQString mergedFrom = bm.metaDataItem( "merged_from" );
if ( !mergedFrom.isNull() ) {
mergedFiles << mergedFrom;
}
@@ -99,20 +99,20 @@ int main( int argc, char**argv )
bool didMergeBookmark = false;
- QString extraBookmarksDirName = QFile::decodeName( args->arg( 0 ) );
- QDir extraBookmarksDir( extraBookmarksDirName, "*.xml" );
+ TQString extraBookmarksDirName = TQFile::decodeName( args->arg( 0 ) );
+ TQDir extraBookmarksDir( extraBookmarksDirName, "*.xml" );
if ( !extraBookmarksDir.isReadable() ) {
kdError() << "Failed to read files in directory " << extraBookmarksDirName << endl;
return 1;
}
for ( unsigned int i = 0; i < extraBookmarksDir.count(); ++i ) {
- const QString fileName = extraBookmarksDir[ i ];
+ const TQString fileName = extraBookmarksDir[ i ];
if ( mergedFiles.find( fileName ) != mergedFiles.end() ) {
continue;
}
- const QString absPath = extraBookmarksDir.filePath( fileName );
+ const TQString absPath = extraBookmarksDir.filePath( fileName );
KBookmarkManager *mgr = KBookmarkManager::managerForFile( absPath, false );
KBookmarkGroup root = mgr->root();
for ( KBookmark bm = root.first(); !bm.isNull(); bm = root.next( bm ) ) {