summaryrefslogtreecommitdiffstats
path: root/kio/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'kio/bookmarks')
-rw-r--r--kio/bookmarks/kbookmark.cc2
-rw-r--r--kio/bookmarks/kbookmarkbar.cc4
-rw-r--r--kio/bookmarks/kbookmarkexporter.cc4
-rw-r--r--kio/bookmarks/kbookmarkexporter.h2
-rw-r--r--kio/bookmarks/kbookmarkimporter.cc2
-rw-r--r--kio/bookmarks/kbookmarkimporter_crash.cc2
-rw-r--r--kio/bookmarks/kbookmarkimporter_ie.cc2
-rw-r--r--kio/bookmarks/kbookmarkimporter_kde1.cc2
-rw-r--r--kio/bookmarks/kbookmarkimporter_ns.cc6
-rw-r--r--kio/bookmarks/kbookmarkimporter_opera.cc2
-rw-r--r--kio/bookmarks/kbookmarkmanager.cc18
-rw-r--r--kio/bookmarks/kbookmarkmenu.cc8
12 files changed, 27 insertions, 27 deletions
diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc
index 44b8b496c..9721788a2 100644
--- a/kio/bookmarks/kbookmark.cc
+++ b/kio/bookmarks/kbookmark.cc
@@ -447,7 +447,7 @@ void KBookmark::updateAccessMetadata()
{
kdDebug(7043) << "KBookmark::updateAccessMetadata " << address() << " " << url().prettyURL() << endl;
- const uint timet = TQDateTime::currentDateTime().toTime_t();
+ const uint timet = TQDateTime::tqcurrentDateTime().toTime_t();
setMetaDataItem( "time_added", TQString::number( timet ), DontOverwriteMetaData );
setMetaDataItem( "time_visited", TQString::number( timet ) );
diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc
index 08c34061b..158caf373 100644
--- a/kio/bookmarks/kbookmarkbar.cc
+++ b/kio/bookmarks/kbookmarkbar.cc
@@ -313,7 +313,7 @@ static TQString handleToolbarDragMoveEvent(
int index = 0;
KToolBarButton* b;
- b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
+ b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos));
KAction *a = 0;
TQString address;
atFirst = false;
@@ -394,7 +394,7 @@ static KAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<KAction> actions
Q_ASSERT(tb);
KToolBarButton *b;
- b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
+ b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos));
if (!b)
return 0;
diff --git a/kio/bookmarks/kbookmarkexporter.cc b/kio/bookmarks/kbookmarkexporter.cc
index 0c11f0a55..30c52bdb8 100644
--- a/kio/bookmarks/kbookmarkexporter.cc
+++ b/kio/bookmarks/kbookmarkexporter.cc
@@ -20,8 +20,8 @@
#include <stdio.h>
#include <tqfile.h>
-#include <textcodec.h>
-#include <stylesheet.h>
+#include <tqtextcodec.h>
+#include <tqstylesheet.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kio/bookmarks/kbookmarkexporter.h b/kio/bookmarks/kbookmarkexporter.h
index dc700fad1..0943d6cbe 100644
--- a/kio/bookmarks/kbookmarkexporter.h
+++ b/kio/bookmarks/kbookmarkexporter.h
@@ -23,7 +23,7 @@
#ifndef __kbookmarkexporter_h
#define __kbookmarkexporter_h
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kbookmark.h>
/**
diff --git a/kio/bookmarks/kbookmarkimporter.cc b/kio/bookmarks/kbookmarkimporter.cc
index cca66d85e..8a31fa3d2 100644
--- a/kio/bookmarks/kbookmarkimporter.cc
+++ b/kio/bookmarks/kbookmarkimporter.cc
@@ -23,7 +23,7 @@
#include <klocale.h>
#include <kdebug.h>
#include <kcharsets.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <sys/types.h>
#include <stddef.h>
diff --git a/kio/bookmarks/kbookmarkimporter_crash.cc b/kio/bookmarks/kbookmarkimporter_crash.cc
index ea00a83b1..988e1f673 100644
--- a/kio/bookmarks/kbookmarkimporter_crash.cc
+++ b/kio/bookmarks/kbookmarkimporter_crash.cc
@@ -29,7 +29,7 @@
#include <tqfile.h>
#include <tqdir.h>
#include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <dcopclient.h>
#include <sys/types.h>
diff --git a/kio/bookmarks/kbookmarkimporter_ie.cc b/kio/bookmarks/kbookmarkimporter_ie.cc
index 40e4be248..8d1372194 100644
--- a/kio/bookmarks/kbookmarkimporter_ie.cc
+++ b/kio/bookmarks/kbookmarkimporter_ie.cc
@@ -22,7 +22,7 @@
#include <kstringhandler.h>
#include <klocale.h>
#include <kdebug.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <sys/types.h>
#include <stddef.h>
diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/kio/bookmarks/kbookmarkimporter_kde1.cc
index c3e280eb6..49999e675 100644
--- a/kio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/kio/bookmarks/kbookmarkimporter_kde1.cc
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <kdebug.h>
#include <kcharsets.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <sys/types.h>
#include <stddef.h>
diff --git a/kio/bookmarks/kbookmarkimporter_ns.cc b/kio/bookmarks/kbookmarkimporter_ns.cc
index b589e55dc..e4e074107 100644
--- a/kio/bookmarks/kbookmarkimporter_ns.cc
+++ b/kio/bookmarks/kbookmarkimporter_ns.cc
@@ -28,8 +28,8 @@
#include <klocale.h>
#include <kdebug.h>
#include <kcharsets.h>
-#include <textcodec.h>
-#include <stylesheet.h>
+#include <tqtextcodec.h>
+#include <tqstylesheet.h>
#include <sys/types.h>
#include <stddef.h>
@@ -191,7 +191,7 @@ void KNSBookmarkExporterImpl::write(KBookmarkGroup parent) {
fstream.setEncoding(m_utf8 ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale);
TQString charset
- = m_utf8 ? "UTF-8" : TQString::fromLatin1(TQTextCodec::codecForLocale()->name()).upper();
+ = m_utf8 ? "UTF-8" : TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name()).upper();
fstream << "<!DOCTYPE NETSCAPE-Bookmark-file-1>" << endl
<< i18n("<!-- This file was generated by Konqueror -->") << endl
diff --git a/kio/bookmarks/kbookmarkimporter_opera.cc b/kio/bookmarks/kbookmarkimporter_opera.cc
index bd520d41d..45ac1a7ca 100644
--- a/kio/bookmarks/kbookmarkimporter_opera.cc
+++ b/kio/bookmarks/kbookmarkimporter_opera.cc
@@ -22,7 +22,7 @@
#include <kstringhandler.h>
#include <klocale.h>
#include <kdebug.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <sys/types.h>
#include <stddef.h>
diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc
index 7f238b4ad..250d62a59 100644
--- a/kio/bookmarks/kbookmarkmanager.cc
+++ b/kio/bookmarks/kbookmarkmanager.cc
@@ -36,7 +36,7 @@
#include <dcopclient.h>
#include <tqfile.h>
#include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kstaticdeleter.h>
#include <tqptrstack.h>
@@ -329,7 +329,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co
// Save the bookmark toolbar folder for quick loading
// but only when it will actually make things quicker
- const TQString cacheFilename = filename + TQString::fromLatin1(".tbcache");
+ const TQString cacheFilename = filename + TQString::tqfromLatin1(".tbcache");
if(toolbarCache && !root().isToolbarGroup())
{
KSaveFile cacheFile( cacheFilename );
@@ -388,7 +388,7 @@ KBookmarkGroup KBookmarkManager::toolbar()
if(!m_docIsLoaded)
{
kdDebug(7043) << "KBookmarkManager::toolbar trying cache" << endl;
- const TQString cacheFilename = m_bookmarksFile + TQString::fromLatin1(".tbcache");
+ const TQString cacheFilename = m_bookmarksFile + TQString::tqfromLatin1(".tbcache");
TQFileInfo bmInfo(m_bookmarksFile);
TQFileInfo cacheInfo(cacheFilename);
if (m_toolbarDoc.isNull() &&
@@ -614,11 +614,11 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser )
void KBookmarkManager::slotEditBookmarks()
{
KProcess proc;
- proc << TQString::fromLatin1("keditbookmarks");
+ proc << TQString::tqfromLatin1("keditbookmarks");
if (!dptr()->m_editorCaption.isNull())
- proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption;
+ proc << TQString::tqfromLatin1("--customcaption") << dptr()->m_editorCaption;
if (!dptr()->m_browserEditor)
- proc << TQString::fromLatin1("--nobrowser");
+ proc << TQString::tqfromLatin1("--nobrowser");
proc << m_bookmarksFile;
proc.start(KProcess::DontCare);
}
@@ -626,8 +626,8 @@ void KBookmarkManager::slotEditBookmarks()
void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address )
{
KProcess proc;
- proc << TQString::fromLatin1("keditbookmarks")
- << TQString::fromLatin1("--address") << address
+ proc << TQString::tqfromLatin1("keditbookmarks")
+ << TQString::tqfromLatin1("--address") << address
<< m_bookmarksFile;
proc.start(KProcess::DontCare);
}
@@ -690,7 +690,7 @@ void KBookmarkManager::updateFavicon( const TQString &url, const TQString &favic
TQString KBookmarkManager::userBookmarksFile()
{
- return locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
+ return locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml"));
}
KBookmarkManager* KBookmarkManager::userBookmarksManager()
diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc
index bed3127f3..0c7965a16 100644
--- a/kio/bookmarks/kbookmarkmenu.cc
+++ b/kio/bookmarks/kbookmarkmenu.cc
@@ -39,11 +39,11 @@
#include <kstdaction.h>
#include <kstringhandler.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqfile.h>
#include <tqheader.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqlistview.h>
#include <tqpushbutton.h>
@@ -403,9 +403,9 @@ void RMB::slotRMBActionCopyLocation( int val )
if ( !bookmark.isGroup() )
{
- kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Selection );
- kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Clipboard );
}
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 09:50:29 +0000