summaryrefslogtreecommitdiffstats
path: root/konqueror/keditbookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/keditbookmarks')
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp8
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.cpp4
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.h2
-rw-r--r--konqueror/keditbookmarks/commands.cpp6
-rw-r--r--konqueror/keditbookmarks/commands.h2
-rw-r--r--konqueror/keditbookmarks/dcop.cpp4
-rw-r--r--konqueror/keditbookmarks/favicons.cpp8
-rw-r--r--konqueror/keditbookmarks/importers.cpp12
-rw-r--r--konqueror/keditbookmarks/keditbookmarks.kcfg2
-rw-r--r--konqueror/keditbookmarks/listview.cpp26
-rw-r--r--konqueror/keditbookmarks/listview.h20
-rw-r--r--konqueror/keditbookmarks/main.cpp6
-rw-r--r--konqueror/keditbookmarks/testlink.cpp36
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp16
-rw-r--r--konqueror/keditbookmarks/toplevel.h2
15 files changed, 77 insertions, 77 deletions
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 2aafe885c..cdd790f0b 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 &Status"), "bookmark", 0,
+ i18n("Check &tqStatus"), "bookmark", 0,
actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
(void) new KAction(
- i18n("Check Status: &All"), 0,
+ i18n("Check tqStatus: &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().findDefaultLocation(true);
+ path = KOperaBookmarkImporterImpl().tqfindDefaultLocation(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().findDefaultLocation(true);
+ path = KIEBookmarkImporterImpl().tqfindDefaultLocation(true);
KIEBookmarkExporterImpl exporter(mgr(), path);
exporter.write(mgr()->root());
return;
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index edc4a66bb..b4d6d6f37 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
- updateStatus();
+ updatetqStatus();
}
-void BookmarkInfoWidget::updateStatus()
+void BookmarkInfoWidget::updatetqStatus()
{
TQString visitDate =
CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, TQStringList() << "info" << "metadata"
diff --git a/konqueror/keditbookmarks/bookmarkinfo.h b/konqueror/keditbookmarks/bookmarkinfo.h
index 8565616ed..bc3ee9f37 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 updateStatus();
+ void updatetqStatus();
public slots:
void slotTextChangedURL(const TQString &);
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index 2ad58a682..c7c5f83a6 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()->invalidate(bk.address());
+ ListView::self()->tqinvalidate(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 encodedData(blah) where
+ // qt docs don't say if tqencodedData(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->encodedData("GALEON_BOOKMARK"));
+ mydrag->setEncodedData(data->tqencodedData("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 3df5d3acf..f7fd468af 100644
--- a/konqueror/keditbookmarks/commands.h
+++ b/konqueror/keditbookmarks/commands.h
@@ -1,4 +1,4 @@
-// kate: space-indent on; indent-width 3; replace-tabs on;
+// kate: space-indent on; indent-width 3; tqreplace-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 a31af0c80..c30930801 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()->updateStatus(url);
- KEBApp::self()->updateStatus(url);
+ ListView::self()->updatetqStatus(url);
+ KEBApp::self()->updatetqStatus(url);
// notice - no save here! see! :)
}
}
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index b9b9b4ea9..6b44fb0a1 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()->restoreStatus();
+ curItem()->restoretqStatus();
delete m_updater;
}
void FavIconsItr::slotDone(bool succeeded) {
// kdDebug() << "FavIconsItr::slotDone()" << endl;
- curItem()->setTmpStatus(succeeded ? i18n("OK") : i18n("No favicon found"));
+ curItem()->setTmptqStatus(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()->setTmpStatus(i18n("Updating favicon..."));
+ curItem()->setTmptqStatus(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()->setTmpStatus(i18n("Local file"));
+ curItem()->setTmptqStatus(i18n("Local file"));
delayedEmitNextOne();
}
}
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 4df0d237d..188398481 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 replace all the current bookmarks?"),
+ top, i18n("Import as a new subfolder or tqreplace 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.findDefaultLocation();
+ return importer.tqfindDefaultLocation();
}
TQString NSImportCommand::requestFilename() const {
static KNSBookmarkImporterImpl importer;
- return importer.findDefaultLocation();
+ return importer.tqfindDefaultLocation();
}
TQString OperaImportCommand::requestFilename() const {
static KOperaBookmarkImporterImpl importer;
- return importer.findDefaultLocation();
+ return importer.tqfindDefaultLocation();
}
TQString CrashesImportCommand::requestFilename() const {
static KCrashBookmarkImporterImpl importer;
- return importer.findDefaultLocation();
+ return importer.tqfindDefaultLocation();
}
TQString IEImportCommand::requestFilename() const {
static KIEBookmarkImporterImpl importer;
- return importer.findDefaultLocation();
+ return importer.tqfindDefaultLocation();
}
// following two are really just xbel
diff --git a/konqueror/keditbookmarks/keditbookmarks.kcfg b/konqueror/keditbookmarks/keditbookmarks.kcfg
index 16da3d8b9..60c5f5933 100644
--- a/konqueror/keditbookmarks/keditbookmarks.kcfg
+++ b/konqueror/keditbookmarks/keditbookmarks.kcfg
@@ -39,4 +39,4 @@
</entry>
</group>
-</kcfg> \ No newline at end of file
+</kcfg>
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 1fa31e967..554f06b99 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::invalidate(const TQString & address)
+void ListView::tqinvalidate(const TQString & address)
{
- invalidate(getItemAtAddress(address));
+ tqinvalidate(getItemAtAddress(address));
}
-void ListView::invalidate(TQListViewItem * item)
+void ListView::tqinvalidate(TQListViewItem * item)
{
if(item->isSelected())
{
@@ -181,7 +181,7 @@ void ListView::invalidate(TQListViewItem * item)
TQListViewItem * child = item->firstChild();
while(child)
{
- //invalidate(child);
+ //tqinvalidate(child);
child = child->nextSibling();
}
}
@@ -277,7 +277,7 @@ void ListView::deselectAllChildren(KEBListViewItem *item)
else
deselectAllChildren(child);
}
- child->repaint();
+ child->tqrepaint();
child = static_cast<KEBListViewItem *>(child->nextSibling());
}
}
@@ -436,7 +436,7 @@ void ListView::handleDropped(KEBListView *, TQDropEvent *e, TQListViewItem *newP
CmdHistory::self()->didCommand(mcmd);
}
-void ListView::updateStatus(TQString url) {
+void ListView::updatetqStatus(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.contains(tree->bookmark().address()))
+ if (s_selected_addresses.tqcontains(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.contains(bk.address()))
+ if (s_selected_addresses.tqcontains(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::StatusColumn, KEBSettings::status());
+ header()->resizeSection(KEBListView::tqStatusColumn, 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::StatusColumn));
+ KEBSettings::setStatus( header()->sectionSize(KEBListView::tqStatusColumn));
#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("Status"), 0);
+ addColumn(i18n("tqStatus"), 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 ); //repaints
+ ListView::deselectAllChildren( this ); //tqrepaints
}
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::StatusColumn) {
+ if (col == KEBListView::tqStatusColumn) {
switch (m_paintStyle) {
case KEBListViewItem::GreyStyle:
{
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index 0ca0edf38..3e6110535 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -1,4 +1,4 @@
-// kate: space-indent on; indent-width 3; replace-tabs on;
+// kate: space-indent on; indent-width 3; tqreplace-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 setOldStatus(const TQString &);
- void setTmpStatus(const TQString &);
- void restoreStatus();
+ void setOldtqStatus(const TQString &);
+ void setTmptqStatus(const TQString &);
+ void restoretqStatus();
- void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
+ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
void setSelected ( bool s );
virtual void setOpen(bool);
@@ -75,7 +75,7 @@ private:
KBookmark m_bookmark;
PaintStyle m_paintStyle;
bool m_emptyFolderPadder;
- TQString m_oldStatus;
+ TQString m_oldtqStatus;
void greyStyle(TQColorGroup &);
void boldStyle(TQPainter *);
};
@@ -88,7 +88,7 @@ public:
NameColumn = 0,
UrlColumn = 1,
CommentColumn = 2,
- StatusColumn = 3,
+ tqStatusColumn = 3,
AddressColumn = 4
};
KEBListView(TQWidget *parent, bool folderList)
@@ -140,8 +140,8 @@ public:
// selected item stuff
void selected(KEBListViewItem * item, bool s);
- void invalidate(const TQString & address);
- void invalidate(TQListViewItem * item);
+ void tqinvalidate(const TQString & address);
+ void tqinvalidate(TQListViewItem * item);
void fixUpCurrent(const TQString & address);
KEBListViewItem * firstSelected() const;
@@ -172,7 +172,7 @@ public:
void rename(int);
void clearSelection();
- void updateStatus(TQString url);
+ void updatetqStatus(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 3416e7e0d..e0a2ae01a 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 (qstrncmp(clientId, wname, wname.length()) != 0)
+ if (tqstrncmp(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::fromLatin1(args->arg(0))
- : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
+ ? TQString::tqfromLatin1(args->arg(0))
+ : locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml"));
if (!isGui) {
CurrentMgr::self()->createManager(filename);
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 0d7d0ddf8..f6d396805 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()->restoreStatus();
+ curItem()->restoretqStatus();
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()->setTmpStatus(i18n("Checking..."));
+ curItem()->setTmptqStatus(i18n("Checking..."));
TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url());
- curItem()->setOldStatus(oldModDate);
+ curItem()->setOldtqStatus(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.replace("\n", " ");
+ jerr.tqreplace("\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.contains(url)
+ return m_modify.tqcontains(url)
? m_modify[url]
: TQString::null;
}
const TQString TestLinkItrHolder::getOldVisit(const TQString &url) const {
- return self()->m_oldModify.contains(url)
+ return self()->m_oldModify.tqcontains(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::StatusColumn, newModDate);
+ setText(KEBListView::tqStatusColumn, 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::StatusColumn, statusLine);
+ setText(KEBListView::tqStatusColumn, statusLine);
}
/* -------------------------- */
// KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::setOldStatus(const TQString &oldStatus) {
- // kdDebug() << "KEBListViewItem::setOldStatus" << endl;
- m_oldStatus = oldStatus;
+void KEBListViewItem::setOldtqStatus(const TQString &oldtqStatus) {
+ // kdDebug() << "KEBListViewItem::setOldtqStatus" << endl;
+ m_oldtqStatus = oldtqStatus;
}
// KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::setTmpStatus(const TQString &status) {
- // kdDebug() << "KEBListViewItem::setTmpStatus" << endl;
+void KEBListViewItem::setTmptqStatus(const TQString &status) {
+ // kdDebug() << "KEBListViewItem::setTmptqStatus" << endl;
m_paintStyle = KEBListViewItem::BoldStyle;
- setText(KEBListView::StatusColumn, status);
+ setText(KEBListView::tqStatusColumn, status);
}
// KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::restoreStatus() {
- if (!m_oldStatus.isNull()) {
- // kdDebug() << "KEBListViewItem::restoreStatus" << endl;
- TestLinkItrHolder::self()->resetToValue(m_bookmark.url().url(), m_oldStatus);
+void KEBListViewItem::restoretqStatus() {
+ if (!m_oldtqStatus.isNull()) {
+ // kdDebug() << "KEBListViewItem::restoretqStatus" << endl;
+ TestLinkItrHolder::self()->resetToValue(m_bookmark.url().url(), m_oldtqStatus);
modUpdate();
}
}
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 4a505d495..3af294f26 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 invalidated by executing
+ // if the currentItem was tqinvalidated 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()->findByAddress(a);
+ return self()->mgr()->tqfindByAddress(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::currentDateTime()) > 31)
+ return (dt.daysTo(TQDateTime::tqcurrentDateTime()) > 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->sizeHint().height() );
+ << m_bkinfo->tqsizeHint().height() );
setCentralWidget(vsplitter);
- resize(ListView::self()->widget()->sizeHint().width(),
- vsplitter->sizeHint().height());
+ resize(ListView::self()->widget()->tqsizeHint().width(),
+ vsplitter->tqsizeHint().height());
createActions();
if (m_browser)
@@ -276,10 +276,10 @@ void KEBApp::construct() {
setAutoSaveSettings();
}
-void KEBApp::updateStatus(TQString url)
+void KEBApp::updatetqStatus(TQString url)
{
if(m_bkinfo->bookmark().url() == url)
- m_bkinfo->updateStatus();
+ m_bkinfo->updatetqStatus();
}
KEBApp::~KEBApp() {
diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h
index 7b1ec5f81..22ed74ec5 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 updateStatus(TQString url);
+ void updatetqStatus(TQString url);
void setActionsEnabled(SelcAbilities);
void setCancelFavIconUpdatesEnabled(bool);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 18:12:26 +0000