Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

15 files changed, 77 insertions, 77 deletions

diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index cdd790f0b..2aafe885c 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -157,11 +157,11 @@ void KEBApp::createActions() {
         i18n("&Open in Konqueror"), "fileopen", 0,
         actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
     (void) new KAction(
-        i18n("Check &tqStatus"), "bookmark", 0,
+        i18n("Check &Status"), "bookmark", 0,
         actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
 
     (void) new KAction(
-        i18n("Check tqStatus: &All"), 0,
+        i18n("Check Status: &All"), 0,
         actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
     (void) new KAction(
         i18n("Update All &Favicons"), 0,
@@ -237,7 +237,7 @@ void CurrentMgr::doExport(ExportType type, const TQString & _path) {
     // TODO - add a factory and make all this use the base class
     if (type == OperaExport) {
         if (path.isNull())
-            path = KOperaBookmarkImporterImpl().tqfindDefaultLocation(true);
+            path = KOperaBookmarkImporterImpl().findDefaultLocation(true);
         KOperaBookmarkExporterImpl exporter(mgr(), path);
         exporter.write(mgr()->root());
         return;
@@ -253,7 +253,7 @@ void CurrentMgr::doExport(ExportType type, const TQString & _path) {
 
     } else if (type == IEExport) {
         if (path.isNull())
-            path = KIEBookmarkImporterImpl().tqfindDefaultLocation(true);
+            path = KIEBookmarkImporterImpl().findDefaultLocation(true);
         KIEBookmarkExporterImpl exporter(mgr(), path);
         exporter.write(mgr()->root());
         return;
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index b4d6d6f37..edc4a66bb 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -106,11 +106,11 @@ void BookmarkInfoWidget::showBookmark(const KBookmark &bk) {
             NodeEditCommand::getNodeText(bk, TQStringList() << "desc"));
 
     // readonly fields
-    updatetqStatus();
+    updateStatus();
  
 }
 
-void BookmarkInfoWidget::updatetqStatus()
+void BookmarkInfoWidget::updateStatus()
 {
    TQString visitDate =
         CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, TQStringList() << "info" << "metadata"
diff --git a/konqueror/keditbookmarks/bookmarkinfo.h b/konqueror/keditbookmarks/bookmarkinfo.h
index bc3ee9f37..8565616ed 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.h
+++ b/konqueror/keditbookmarks/bookmarkinfo.h
@@ -47,7 +47,7 @@ public:
     KBookmark bookmark() { return m_bk; }
     bool connected() { return m_connected; };
     void setConnected(bool b) { m_connected = b; };
-    void updatetqStatus();
+    void updateStatus();
 
 public slots:
     void slotTextChangedURL(const TQString &);
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index c7c5f83a6..2ad58a682 100644
--- a/konqueror/keditbookmarks/commands.cpp
+++ b/konqueror/keditbookmarks/commands.cpp
@@ -218,7 +218,7 @@ void CreateCommand::unexecute() {
     KBookmark bk = CurrentMgr::bookmarkAt(m_to);
     Q_ASSERT(!bk.isNull() && !bk.parentGroup().isNull());
 
-    ListView::self()->tqinvalidate(bk.address());
+    ListView::self()->invalidate(bk.address());
 
     bk.parentGroup().deleteBookmark(bk);
 }
@@ -643,13 +643,13 @@ KEBMacroCommand* CmdGen::insertMimeSource(
     bool modified = false;
     const char *format = 0;
     for (int i = 0; format = data->format(i), format; i++) {
-        // qt docs don't say if tqencodedData(blah) where
+        // qt docs don't say if encodedData(blah) where
         // blah is not a stored mimetype should return null
         // or not. so, we search. sucky...
         if (strcmp(format, "GALEON_BOOKMARK") == 0) { 
             modified = true;
             TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel");
-            mydrag->setEncodedData(data->tqencodedData("GALEON_BOOKMARK"));
+            mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK"));
             data = mydrag;
             break;
         } else if( strcmp(format, "application/x-xbel" )==0) {
diff --git a/konqueror/keditbookmarks/commands.h b/konqueror/keditbookmarks/commands.h
index f7fd468af..3df5d3acf 100644
--- a/konqueror/keditbookmarks/commands.h
+++ b/konqueror/keditbookmarks/commands.h
@@ -1,4 +1,4 @@
-// kate: space-indent on; indent-width 3; tqreplace-tabs on;
+// kate: space-indent on; indent-width 3; replace-tabs on;
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp
index c30930801..a31af0c80 100644
--- a/konqueror/keditbookmarks/dcop.cpp
+++ b/konqueror/keditbookmarks/dcop.cpp
@@ -59,8 +59,8 @@ void KBookmarkEditorIface::slotDcopUpdatedAccessMetadata(TQString filename, TQSt
         kdDebug() << "slotDcopUpdatedAccessMetadata(" << url << ")" << endl;
         // no undo
         CurrentMgr::self()->mgr()->updateAccessMetadata(url, false);
-        ListView::self()->updatetqStatus(url);
-        KEBApp::self()->updatetqStatus(url);
+        ListView::self()->updateStatus(url);
+        KEBApp::self()->updateStatus(url);
         // notice - no save here! see! :)
     }
 }
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index 6b44fb0a1..b9b9b4ea9 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -66,13 +66,13 @@ FavIconsItr::FavIconsItr(TQValueList<KBookmark> bks)
 
 FavIconsItr::~FavIconsItr() {
     if (curItem())
-        curItem()->restoretqStatus();
+        curItem()->restoreStatus();
     delete m_updater;
 }
 
 void FavIconsItr::slotDone(bool succeeded) {
     // kdDebug() << "FavIconsItr::slotDone()" << endl;
-    curItem()->setTmptqStatus(succeeded ? i18n("OK") : i18n("No favicon found"));
+    curItem()->setTmpStatus(succeeded ? i18n("OK") : i18n("No favicon found"));
     holder()->addAffectedBookmark(KBookmark::parentAddress(curBk().address()));
     delayedEmitNextOne();
 }
@@ -83,7 +83,7 @@ bool FavIconsItr::isApplicable(const KBookmark &bk) const {
 
 void FavIconsItr::doAction() {
     // kdDebug() << "FavIconsItr::doAction()" << endl;
-    curItem()->setTmptqStatus(i18n("Updating favicon..."));
+    curItem()->setTmpStatus(i18n("Updating favicon..."));
     if (!m_updater) {
         m_updater = new FavIconUpdater(kapp, "FavIconUpdater");
         connect(m_updater, TQT_SIGNAL( done(bool) ),
@@ -92,7 +92,7 @@ void FavIconsItr::doAction() {
     if (curBk().url().protocol().startsWith("http")) {
         m_updater->downloadIcon(curBk());
     } else {
-        curItem()->setTmptqStatus(i18n("Local file"));
+        curItem()->setTmpStatus(i18n("Local file"));
         delayedEmitNextOne();
     }
 }
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 188398481..4df0d237d 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -73,7 +73,7 @@ ImportCommand* ImportCommand::performImport(const TQCString &type, TQWidget *top
 
     int answer =
         KMessageBox::questionYesNoCancel(
-                top, i18n("Import as a new subfolder or tqreplace all the current bookmarks?"),
+                top, i18n("Import as a new subfolder or replace all the current bookmarks?"),
                 i18n("%1 Import").arg(importer->visibleName()),
                 i18n("As New Folder"), i18n("Replace"));
 
@@ -149,27 +149,27 @@ TQString ImportCommand::affectedBookmarks() const
 
 TQString MozImportCommand::requestFilename() const {
     static KMozillaBookmarkImporterImpl importer;
-    return importer.tqfindDefaultLocation();
+    return importer.findDefaultLocation();
 }
 
 TQString NSImportCommand::requestFilename() const {
     static KNSBookmarkImporterImpl importer;
-    return importer.tqfindDefaultLocation();
+    return importer.findDefaultLocation();
 }
 
 TQString OperaImportCommand::requestFilename() const {
     static KOperaBookmarkImporterImpl importer;
-    return importer.tqfindDefaultLocation();
+    return importer.findDefaultLocation();
 }
 
 TQString CrashesImportCommand::requestFilename() const {
     static KCrashBookmarkImporterImpl importer;
-    return importer.tqfindDefaultLocation();
+    return importer.findDefaultLocation();
 }
 
 TQString IEImportCommand::requestFilename() const {
     static KIEBookmarkImporterImpl importer;
-    return importer.tqfindDefaultLocation();
+    return importer.findDefaultLocation();
 }
 
 // following two are really just xbel
diff --git a/konqueror/keditbookmarks/keditbookmarks.kcfg b/konqueror/keditbookmarks/keditbookmarks.kcfg
index 60c5f5933..16da3d8b9 100644
--- a/konqueror/keditbookmarks/keditbookmarks.kcfg
+++ b/konqueror/keditbookmarks/keditbookmarks.kcfg
@@ -39,4 +39,4 @@
     </entry>
   </group> 
 
-</kcfg>
+</kcfg>
\ No newline at end of file
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 554f06b99..1fa31e967 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -158,12 +158,12 @@ TQValueList<KBookmark> ListView::itemsToBookmarks(const TQValueVector<KEBListVie
     return bookmarks;
 }
 
-void ListView::tqinvalidate(const TQString & address)
+void ListView::invalidate(const TQString & address)
 {
-    tqinvalidate(getItemAtAddress(address));
+    invalidate(getItemAtAddress(address));
 }
 
-void ListView::tqinvalidate(TQListViewItem * item)
+void ListView::invalidate(TQListViewItem * item)
 {
     if(item->isSelected())
     {
@@ -181,7 +181,7 @@ void ListView::tqinvalidate(TQListViewItem * item)
     TQListViewItem * child = item->firstChild();
     while(child)
     {
-        //tqinvalidate(child);
+        //invalidate(child);
         child = child->nextSibling();
     }
 }
@@ -277,7 +277,7 @@ void ListView::deselectAllChildren(KEBListViewItem *item)
             else
                 deselectAllChildren(child);
         }
-        child->tqrepaint();
+        child->repaint();
         child = static_cast<KEBListViewItem *>(child->nextSibling());
     }
 }
@@ -436,7 +436,7 @@ void ListView::handleDropped(KEBListView *, TQDropEvent *e, TQListViewItem *newP
     CmdHistory::self()->didCommand(mcmd);
 }
 
-void ListView::updatetqStatus(TQString url) {
+void ListView::updateStatus(TQString url) {
     m_listView->updateByURL(url);
 }
 
@@ -483,7 +483,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI
         KEBListViewItem *tree = new KEBListViewItem(lv, group);
         fillWithGroup(lv, group, tree);
         tree->TQListViewItem::setOpen(true);
-        if (s_selected_addresses.tqcontains(tree->bookmark().address()))
+        if (s_selected_addresses.contains(tree->bookmark().address()))
             lv->setSelected(tree, true);
         if(!s_current_address.isNull() && s_current_address == tree->bookmark().address())
             lv->setCurrentItem(tree);
@@ -515,7 +515,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI
                         : new KEBListViewItem(lv, bk));
             lastItem = item;
         }
-        if (s_selected_addresses.tqcontains(bk.address()))
+        if (s_selected_addresses.contains(bk.address()))
             lv->setSelected(item, true);
         if(!s_current_address.isNull() && s_current_address == bk.address())
             lv->setCurrentItem(item);
@@ -670,7 +670,7 @@ void KEBListView::loadColumnSetting()
     header()->resizeSection(KEBListView::NameColumn, KEBSettings::name());
     header()->resizeSection(KEBListView::UrlColumn, KEBSettings::uRL());
     header()->resizeSection(KEBListView::CommentColumn, KEBSettings::comment());
-    header()->resizeSection(KEBListView::tqStatusColumn, KEBSettings::status());
+    header()->resizeSection(KEBListView::StatusColumn, KEBSettings::status());
 #ifdef DEBUG_ADDRESSES
     header()->resizeSection(KEBListView::AddressColumn, KEBSettings::address());
 #endif
@@ -683,7 +683,7 @@ void KEBListView::saveColumnSetting ()
         KEBSettings::setName( header()->sectionSize(KEBListView::NameColumn));
         KEBSettings::setURL( header()->sectionSize(KEBListView::UrlColumn));
         KEBSettings::setComment( header()->sectionSize(KEBListView::CommentColumn));
-        KEBSettings::setStatus( header()->sectionSize(KEBListView::tqStatusColumn));
+        KEBSettings::setStatus( header()->sectionSize(KEBListView::StatusColumn));
 #ifdef DEBUG_ADDRESSES
         KEBSettings::setAddress( header()->sectionSize(KEBListView::AddressColumn));
 #endif
@@ -702,7 +702,7 @@ void KEBListView::init() {
         addColumn(i18n("Bookmark"), 0); // KEBListView::NameColumn
         addColumn(i18n("URL"), 0);
         addColumn(i18n("Comment"), 0);
-        addColumn(i18n("tqStatus"), 0);
+        addColumn(i18n("Status"), 0);
 #ifdef DEBUG_ADDRESSES
         addColumn(i18n("Address"), 0);
 #endif
@@ -829,7 +829,7 @@ void KEBListViewItem::setSelected(bool s)
     {
         ListView::self()->selected(this, false);
         TQListViewItem::setSelected( false );
-        ListView::deselectAllChildren( this ); //tqrepaints
+        ListView::deselectAllChildren( this ); //repaints
     }
     else if(parentSelected(this))
         return;
@@ -939,7 +939,7 @@ void KEBListViewItem::paintCell(TQPainter *p, const TQColorGroup &ocg, int col,
         cg.setColor(TQColorGroup::Base, col);
     }
 
-    if (col == KEBListView::tqStatusColumn) {
+    if (col == KEBListView::StatusColumn) {
         switch (m_paintStyle) {
            case KEBListViewItem::GreyStyle:
                 {
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index 3e6110535..0ca0edf38 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -1,4 +1,4 @@
-// kate: space-indent on; indent-width 3; tqreplace-tabs on;
+// kate: space-indent on; indent-width 3; replace-tabs on;
 /* This file is part of the KDE project
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
 
@@ -52,11 +52,11 @@ public:
 
    void modUpdate();
 
-   void setOldtqStatus(const TQString &);
-   void setTmptqStatus(const TQString &);
-   void restoretqStatus();
+   void setOldStatus(const TQString &);
+   void setTmpStatus(const TQString &);
+   void restoreStatus();
 
-   void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
+   void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
    void setSelected ( bool s );
 
    virtual void setOpen(bool);
@@ -75,7 +75,7 @@ private:
    KBookmark m_bookmark;
    PaintStyle m_paintStyle;
    bool m_emptyFolderPadder;
-   TQString m_oldtqStatus;
+   TQString m_oldStatus;
    void greyStyle(TQColorGroup &);
    void boldStyle(TQPainter *);
 };
@@ -88,7 +88,7 @@ public:
       NameColumn = 0,
       UrlColumn = 1,
       CommentColumn = 2,
-      tqStatusColumn = 3,
+      StatusColumn = 3,
       AddressColumn = 4
    };
    KEBListView(TQWidget *parent, bool folderList) 
@@ -140,8 +140,8 @@ public:
    // selected item stuff
    void selected(KEBListViewItem * item, bool s);
    
-   void tqinvalidate(const TQString & address);
-   void tqinvalidate(TQListViewItem * item);
+   void invalidate(const TQString & address);
+   void invalidate(TQListViewItem * item);
    void fixUpCurrent(const TQString & address);
 
    KEBListViewItem * firstSelected() const;
@@ -172,7 +172,7 @@ public:
    void rename(int);
    void clearSelection();
 
-   void updatetqStatus(TQString url);
+   void updateStatus(TQString url);
 
    static ListView* self() { return s_self; }
    static void createListViews(TQSplitter *parent);
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index e0a2ae01a..3416e7e0d 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -67,7 +67,7 @@ static void continueInWindow(TQString _wname) {
     for (QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it) {
         TQCString &clientId = *it;
 
-        if (tqstrncmp(clientId, wname, wname.length()) != 0)
+        if (qstrncmp(clientId, wname, wname.length()) != 0)
             continue;
 
         DCOPRef client(clientId.data(), wname + "-mainwindow#1");
@@ -139,8 +139,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
     bool gotArg = (args->count() == 1);
 
     TQString filename = gotArg
-        ? TQString::tqfromLatin1(args->arg(0))
-        : locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml"));
+        ? TQString::fromLatin1(args->arg(0))
+        : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
 
     if (!isGui) {
         CurrentMgr::self()->createManager(filename);
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index f6d396805..0d7d0ddf8 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -73,7 +73,7 @@ TestLinkItr::TestLinkItr(TQValueList<KBookmark> bks)
 TestLinkItr::~TestLinkItr() {
     if (m_job) {
         // kdDebug() << "JOB kill\n";
-        curItem()->restoretqStatus();
+        curItem()->restoreStatus();
         m_job->disconnect();
         m_job->kill(false);
     }
@@ -95,9 +95,9 @@ void TestLinkItr::doAction() {
     connect(m_job, TQT_SIGNAL( data( KIO::Job *,  const TQByteArray &)),
             this, TQT_SLOT( slotJobData(KIO::Job *, const TQByteArray &)));
 
-    curItem()->setTmptqStatus(i18n("Checking..."));
+    curItem()->setTmpStatus(i18n("Checking..."));
     TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url());
-    curItem()->setOldtqStatus(oldModDate);
+    curItem()->setOldStatus(oldModDate);
     TestLinkItrHolder::self()->setMod(curBk().url().url(), i18n("Checking..."));
 }
 
@@ -144,7 +144,7 @@ void TestLinkItr::slotJobResult(KIO::Job *job) {
         // can we assume that errorString will contain no entities?
         TQString jerr = job->errorString();
         if (!jerr.isEmpty()) {
-            jerr.tqreplace("\n", " ");
+            jerr.replace("\n", " ");
             curItem()->nsPut(jerr);
             chkErr = false;
         }
@@ -166,13 +166,13 @@ void TestLinkItr::slotJobResult(KIO::Job *job) {
 /* -------------------------- */
 
 const TQString TestLinkItrHolder::getMod(const TQString &url) const {
-    return m_modify.tqcontains(url) 
+    return m_modify.contains(url) 
         ? m_modify[url] 
         : TQString::null;
 }
 
 const TQString TestLinkItrHolder::getOldVisit(const TQString &url) const {
-    return self()->m_oldModify.tqcontains(url) 
+    return self()->m_oldModify.contains(url) 
         ? self()->m_oldModify[url] 
         : TQString::null;
 }
@@ -347,7 +347,7 @@ void KEBListViewItem::nsPut(const TQString &newModDate) {
     TQString blah = updateNsInfoMod(info, newModDate);
     m_bookmark.internalElement().setAttribute(NetscapeInfoAttribute, blah);
     TestLinkItrHolder::self()->setMod(m_bookmark.url().url(), newModDate);
-    setText(KEBListView::tqStatusColumn, newModDate);
+    setText(KEBListView::StatusColumn, newModDate);
 }
 
 // KEBListViewItem !!!!!!!!!!!
@@ -365,29 +365,29 @@ void KEBListViewItem::modUpdate() {
     TQString statusLine;
     statusLine = TestLinkItrHolder::calcPaintStyle(m_bookmark.url().url(), m_paintStyle, iVisit, oldModify);
     if (statusLine != "Error")
-        setText(KEBListView::tqStatusColumn, statusLine);
+        setText(KEBListView::StatusColumn, statusLine);
 }
 
 /* -------------------------- */
 
 // KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::setOldtqStatus(const TQString &oldtqStatus) {
-    // kdDebug() << "KEBListViewItem::setOldtqStatus" << endl;
-    m_oldtqStatus = oldtqStatus;
+void KEBListViewItem::setOldStatus(const TQString &oldStatus) {
+    // kdDebug() << "KEBListViewItem::setOldStatus" << endl;
+    m_oldStatus = oldStatus;
 }
 
 // KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::setTmptqStatus(const TQString &status) {
-    // kdDebug() << "KEBListViewItem::setTmptqStatus" << endl;
+void KEBListViewItem::setTmpStatus(const TQString &status) {
+    // kdDebug() << "KEBListViewItem::setTmpStatus" << endl;
     m_paintStyle = KEBListViewItem::BoldStyle;
-    setText(KEBListView::tqStatusColumn, status);
+    setText(KEBListView::StatusColumn, status);
 }
 
 // KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::restoretqStatus() {
-    if (!m_oldtqStatus.isNull()) {
-        // kdDebug() << "KEBListViewItem::restoretqStatus" << endl;
-        TestLinkItrHolder::self()->resetToValue(m_bookmark.url().url(), m_oldtqStatus);
+void KEBListViewItem::restoreStatus() {
+    if (!m_oldStatus.isNull()) {
+        // kdDebug() << "KEBListViewItem::restoreStatus" << endl;
+        TestLinkItrHolder::self()->resetToValue(m_bookmark.url().url(), m_oldStatus);
         modUpdate();
     }
 }
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 3af294f26..4a505d495 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -82,7 +82,7 @@ void CmdHistory::slotCommandExecuted(KCommand *k) {
     CurrentMgr::self()->notifyManagers(bk.toGroup());
 
     // sets currentItem to something sensible
-    // if the currentItem was tqinvalidated by executing
+    // if the currentItem was invalidated by executing
     // CreateCommand or DeleteManyCommand
     // otherwise does nothing
     // sensible is either a already selected item or cmd->currentAddress()
@@ -122,7 +122,7 @@ void CmdHistory::clearHistory() {
 CurrentMgr *CurrentMgr::s_mgr = 0;
 
 KBookmark CurrentMgr::bookmarkAt(const TQString &a) {
-    return self()->mgr()->tqfindByAddress(a);
+    return self()->mgr()->findByAddress(a);
 }
 
 bool CurrentMgr::managerSave() { return mgr()->save(); }
@@ -184,7 +184,7 @@ TQString CurrentMgr::makeTimeStr(int b)
 {
     TQDateTime dt;
     dt.setTime_t(b);
-    return (dt.daysTo(TQDateTime::tqcurrentDateTime()) > 31)
+    return (dt.daysTo(TQDateTime::currentDateTime()) > 31)
         ? KGlobal::locale()->formatDate(dt.date(), false)
         : KGlobal::locale()->formatDateTime(dt, false);
 }
@@ -233,11 +233,11 @@ KEBApp::KEBApp(
 
     vsplitter->setOrientation(TQSplitter::Vertical);
     vsplitter->setSizes(TQValueList<int>() << h << 380
-                                          << m_bkinfo->tqsizeHint().height() );
+                                          << m_bkinfo->sizeHint().height() );
 
     setCentralWidget(vsplitter);
-    resize(ListView::self()->widget()->tqsizeHint().width(),
-           vsplitter->tqsizeHint().height());
+    resize(ListView::self()->widget()->sizeHint().width(),
+           vsplitter->sizeHint().height());
 
     createActions();
     if (m_browser)
@@ -276,10 +276,10 @@ void KEBApp::construct() {
     setAutoSaveSettings();
 }
 
-void KEBApp::updatetqStatus(TQString url)
+void KEBApp::updateStatus(TQString url)
 {
     if(m_bkinfo->bookmark().url() == url)
-        m_bkinfo->updatetqStatus();
+        m_bkinfo->updateStatus();
 }
 
 KEBApp::~KEBApp() {
diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h
index 22ed74ec5..7b1ec5f81 100644
--- a/konqueror/keditbookmarks/toplevel.h
+++ b/konqueror/keditbookmarks/toplevel.h
@@ -116,7 +116,7 @@ public:
     KEBApp(const TQString & bookmarksFile, bool readonly, const TQString &address, bool browser, const TQString &caption);
     virtual ~KEBApp();
 
-    void updatetqStatus(TQString url);
+    void updateStatus(TQString url);
     void setActionsEnabled(SelcAbilities);
 
     void setCancelFavIconUpdatesEnabled(bool);