summaryrefslogtreecommitdiffstats
path: root/konqueror/keditbookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/keditbookmarks')
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp92
-rw-r--r--konqueror/keditbookmarks/commands.cpp6
-rw-r--r--konqueror/keditbookmarks/favicons.cpp2
-rw-r--r--konqueror/keditbookmarks/importers.cpp2
-rw-r--r--konqueror/keditbookmarks/kbookmarkmerger.cpp2
-rw-r--r--konqueror/keditbookmarks/listview.cpp32
-rw-r--r--konqueror/keditbookmarks/listview.h10
-rw-r--r--konqueror/keditbookmarks/main.cpp8
-rw-r--r--konqueror/keditbookmarks/testlink.cpp10
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp16
10 files changed, 90 insertions, 90 deletions
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 2aafe885c..bbfb548ad 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -80,136 +80,136 @@ void KEBApp::createActions() {
// save and quit should probably not be in the toplevel???
(void) KStdAction::quit(
- this, TQT_SLOT( close() ), actionCollection());
+ TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
(void) KStdAction::configureToolbars(
- this, TQT_SLOT( slotConfigureToolbars() ), actionCollection());
+ TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection());
if (m_browser) {
(void) KStdAction::open(
- actn, TQT_SLOT( slotLoad() ), actionCollection());
+ TQT_TQOBJECT(actn), TQT_SLOT( slotLoad() ), actionCollection());
(void) KStdAction::saveAs(
- actn, TQT_SLOT( slotSaveAs() ), actionCollection());
+ TQT_TQOBJECT(actn), TQT_SLOT( slotSaveAs() ), actionCollection());
}
- (void) KStdAction::cut(actn, TQT_SLOT( slotCut() ), actionCollection());
- (void) KStdAction::copy(actn, TQT_SLOT( slotCopy() ), actionCollection());
- (void) KStdAction::paste(actn, TQT_SLOT( slotPaste() ), actionCollection());
- (void) KStdAction::print(actn, TQT_SLOT( slotPrint() ), actionCollection());
+ (void) KStdAction::cut(TQT_TQOBJECT(actn), TQT_SLOT( slotCut() ), actionCollection());
+ (void) KStdAction::copy(TQT_TQOBJECT(actn), TQT_SLOT( slotCopy() ), actionCollection());
+ (void) KStdAction::paste(TQT_TQOBJECT(actn), TQT_SLOT( slotPaste() ), actionCollection());
+ (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), actionCollection());
// settings menu
(void) new KToggleAction(
i18n("&Show Netscape Bookmarks in Konqueror"), 0,
- actn, TQT_SLOT( slotShowNS() ), actionCollection(),
+ TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(),
"settings_showNS");
// actions
(void) new KAction(
i18n("&Delete"), "editdelete", Key_Delete,
- actn, TQT_SLOT( slotDelete() ), actionCollection(), "delete");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete");
(void) new KAction(
i18n("Rename"), "text", Key_F2,
- actn, TQT_SLOT( slotRename() ), actionCollection(), "rename");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename");
(void) new KAction(
i18n("C&hange URL"), "text", Key_F3,
- actn, TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
(void) new KAction(
i18n("C&hange Comment"), "text", Key_F4,
- actn, TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
(void) new KAction(
i18n("Chan&ge Icon..."), "icons", 0,
- actn, TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
(void) new KAction(
i18n("Update Favicon"), 0,
- actn, TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
(void) new KAction(
i18n("Recursive Sort"), 0,
- actn, TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
(void) new KAction(
i18n("&New Folder..."), "folder_new", CTRL+Key_N,
- actn, TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
(void) new KAction(
i18n("&New Bookmark"), "www", 0,
- actn, TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
(void) new KAction(
i18n("&Insert Separator"), CTRL+Key_I,
- actn, TQT_SLOT( slotInsertSeparator() ), actionCollection(),
+ TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(),
"insertseparator");
(void) new KAction(
i18n("&Sort Alphabetically"), 0,
- actn, TQT_SLOT( slotSort() ), actionCollection(), "sort");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort");
(void) new KAction(
i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0,
- actn, TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
(void) new KAction(
i18n("Show in T&oolbar"), "bookmark_toolbar", 0,
- actn, TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
(void) new KAction(
i18n("Hide in T&oolbar"), "bookmark_toolbar", 0,
- actn, TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
(void) new KAction(
i18n("&Expand All Folders"), 0,
- actn, TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
(void) new KAction(
i18n("Collapse &All Folders"), 0,
- actn, TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
+ TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
(void) new KAction(
i18n("&Open in Konqueror"), "fileopen", 0,
- actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
+ TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
(void) new KAction(
i18n("Check &Status"), "bookmark", 0,
- actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
+ TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
(void) new KAction(
i18n("Check Status: &All"), 0,
- actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
+ TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
(void) new KAction(
i18n("Update All &Favicons"), 0,
- actn, TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
+ TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
"updateallfavicons" );
(void) new KAction(
i18n("Cancel &Checks"), 0,
- actn, TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
+ TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
(void) new KAction(
i18n("Cancel &Favicon Updates"), 0,
- actn, TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
+ TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
"cancelfaviconupdates" );
(void) new KAction(
i18n("Import &Netscape Bookmarks..."), "netscape", 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importNS");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS");
(void) new KAction(
i18n("Import &Opera Bookmarks..."), "opera", 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
(void) new KAction(
i18n("Import All &Crash Sessions as Bookmarks..."), 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
(void) new KAction(
i18n("Import &Galeon Bookmarks..."), 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
(void) new KAction(
i18n("Import &KDE2/KDE3 Bookmarks..."), 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
(void) new KAction(
i18n("Import &IE Bookmarks..."), 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importIE");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE");
(void) new KAction(
i18n("Import &Mozilla Bookmarks..."), "mozilla", 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
(void) new KAction(
i18n("Export to &Netscape Bookmarks"), "netscape", 0,
- actn, TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
(void) new KAction(
i18n("Export to &Opera Bookmarks..."), "opera", 0,
- actn, TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
(void) new KAction(
i18n("Export to &HTML Bookmarks..."), "html", 0,
- actn, TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
(void) new KAction(
i18n("Export to &IE Bookmarks..."), 0,
- actn, TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
(void) new KAction(
i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0,
- actn, TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
}
void ActionsImpl::slotLoad() {
@@ -345,7 +345,7 @@ void ActionsImpl::slotCopy() {
TQValueList<KBookmark> bookmarks
= ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */);
- kapp->clipboard()->setData(data, QClipboard::Clipboard);
+ kapp->tqclipboard()->setData(data, QClipboard::Clipboard);
}
void ActionsImpl::slotPaste() {
@@ -353,7 +353,7 @@ void ActionsImpl::slotPaste() {
KEBMacroCommand *mcmd =
CmdGen::insertMimeSource(
i18n("Paste"),
- kapp->clipboard()->data(QClipboard::Clipboard),
+ kapp->tqclipboard()->data(QClipboard::Clipboard),
ListView::self()->userAddress());
CmdHistory::self()->didCommand(mcmd);
}
@@ -394,7 +394,7 @@ void ActionsImpl::slotImport() {
// kdDebug() << "ActionsImpl::slotImport() where sender()->name() == "
// << sender()->name() << endl;
ImportCommand* import
- = ImportCommand::performImport(sender()->name()+6, KEBApp::self());
+ = ImportCommand::performImport(TQT_TQOBJECT_CONST(sender())->name()+6, KEBApp::self());
if (!import)
return;
CmdHistory::self()->addCommand(import);
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/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index b9b9b4ea9..3ee09fb35 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -85,7 +85,7 @@ void FavIconsItr::doAction() {
// kdDebug() << "FavIconsItr::doAction()" << endl;
curItem()->setTmpStatus(i18n("Updating favicon..."));
if (!m_updater) {
- m_updater = new FavIconUpdater(kapp, "FavIconUpdater");
+ m_updater = new FavIconUpdater(TQT_TQOBJECT(kapp), "FavIconUpdater");
connect(m_updater, TQT_SIGNAL( done(bool) ),
this, TQT_SLOT( slotDone(bool) ) );
}
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 4df0d237d..3a9a613c1 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -45,7 +45,7 @@ TQString ImportCommand::name() const {
}
TQString ImportCommand::folder() const {
- return m_folder ? i18n("%1 Bookmarks").arg(visibleName()) : TQString::null;
+ return m_folder ? i18n("%1 Bookmarks").arg(visibleName()) : TQString();
}
ImportCommand* ImportCommand::importerFactory(const TQCString &type) {
diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp
index d34794fdc..222b0c89b 100644
--- a/konqueror/keditbookmarks/kbookmarkmerger.cpp
+++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp
@@ -108,7 +108,7 @@ int main( int argc, char**argv )
for ( unsigned int i = 0; i < extraBookmarksDir.count(); ++i ) {
const TQString fileName = extraBookmarksDir[ i ];
- if ( mergedFiles.find( fileName ) != mergedFiles.end() ) {
+ if ( mergedFiles.tqfind( fileName ) != mergedFiles.end() ) {
continue;
}
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 1fa31e967..64ec1d337 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -118,8 +118,8 @@ bool lessAddress(TQString a, TQString b)
if(bLast +1 == bEnd)
return false;
- uint aNext = a.find("/", aLast + 1);
- uint bNext = b.find("/", bLast + 1);
+ uint aNext = a.tqfind("/", aLast + 1);
+ uint bNext = b.tqfind("/", bLast + 1);
bool okay;
uint aNum = a.mid(aLast + 1, aNext - aLast - 1).toUInt(&okay);
@@ -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();
}
}
@@ -218,7 +218,7 @@ void ListView::selected(KEBListViewItem * item, bool s)
if(s)
mSelectedItems[item] = item;
else
- if((it = mSelectedItems.find(item)) != mSelectedItems.end())
+ if((it = mSelectedItems.tqfind(item)) != mSelectedItems.end())
mSelectedItems.remove(it);
KEBApp::self()->updateActions();
@@ -277,7 +277,7 @@ void ListView::deselectAllChildren(KEBListViewItem *item)
else
deselectAllChildren(child);
}
- child->repaint();
+ child->tqrepaint();
child = static_cast<KEBListViewItem *>(child->nextSibling());
}
}
@@ -376,7 +376,7 @@ KEBListViewItem* ListView::getItemAtAddress(const TQString &address) const {
void ListView::setOpen(bool open) {
for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it)
- if (it.current()->parent())
+ if (it.current()->tqparent())
it.current()->setOpen(open);
}
@@ -456,7 +456,7 @@ void ListView::updateListView()
{
KEBListViewItem * item = static_cast<KEBListViewItem*>(m_listView->currentItem());
if(item->isEmptyFolderPadder())
- s_current_address = static_cast<KEBListViewItem*>(item->parent())->bookmark().address();
+ s_current_address = static_cast<KEBListViewItem*>(item->tqparent())->bookmark().address();
else
s_current_address = item->bookmark().address();
}
@@ -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);
@@ -804,7 +804,7 @@ TQDragObject *KEBListView::dragObject() {
bool KEBListViewItem::parentSelected(TQListViewItem * item)
{
TQListViewItem *root = item->listView()->firstChild();
- for( TQListViewItem *parent = item->parent(); parent ; parent = parent->parent())
+ for( TQListViewItem *parent = item->tqparent(); parent ; parent = parent->tqparent())
if (parent->isSelected() && parent != root)
return true;
return false;
@@ -814,7 +814,7 @@ void KEBListViewItem::setSelected(bool s)
{
if( isEmptyFolderPadder())
{
- parent()->setSelected(true);
+ tqparent()->setSelected(true);
return;
}
@@ -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;
@@ -904,7 +904,7 @@ KEBListViewItem::KEBListViewItem(TQListView *parent, TQListViewItem *after, cons
// DESIGN - move this into kbookmark or into a helper
void KEBListViewItem::setOpen(bool open) {
- if (!parent())
+ if (!tqparent())
return;
m_bookmark.internalElement().setAttribute("folded", open ? "no" : "yes");
TQListViewItem::setOpen(open);
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index 0ca0edf38..c05226ff6 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -36,7 +36,7 @@
class TQSplitter;
class KListViewSearchLine;
-class KEBListViewItem : public QListViewItem
+class KEBListViewItem : public TQListViewItem
{
public:
KEBListViewItem(TQListView *, const KBookmarkGroup &);
@@ -56,7 +56,7 @@ public:
void setTmpStatus(const TQString &);
void restoreStatus();
- 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);
@@ -127,7 +127,7 @@ private:
};
// DESIGN - make some stuff private if possible
-class ListView : public QObject
+class ListView : public TQObject
{
Q_OBJECT
public:
@@ -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;
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 3416e7e0d..9b19ee449 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);
@@ -182,7 +182,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
TQString caption = args->isSet("customcaption")
? TQString::fromLocal8Bit(args->getOption("customcaption"))
- : TQString::null;
+ : TQString();
args->clear();
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 0d7d0ddf8..dd2429ab1 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -107,10 +107,10 @@ void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) {
if (transfer->isErrorPage()) {
TQStringList lines = TQStringList::split('\n', data);
for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) {
- int open_pos = (*it).find("<title>", 0, false);
+ int open_pos = (*it).tqfind("<title>", 0, false);
if (open_pos >= 0) {
TQString leftover = (*it).mid(open_pos + 7);
- int close_pos = leftover.findRev("</title>", -1, false);
+ int close_pos = leftover.tqfindRev("</title>", -1, false);
if (close_pos >= 0) {
// if no end tag found then just
// print the first line of the <title>
@@ -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;
}
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 4a505d495..ce2d9db58 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()
@@ -184,8 +184,8 @@ TQString CurrentMgr::makeTimeStr(int b)
{
TQDateTime dt;
dt.setTime_t(b);
- return (dt.daysTo(TQDateTime::currentDateTime()) > 31)
- ? KGlobal::locale()->formatDate(dt.date(), false)
+ return (dt.daysTo(TQDateTime::tqcurrentDateTime()) > 31)
+ ? KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)
: KGlobal::locale()->formatDateTime(dt, false);
}
@@ -231,13 +231,13 @@ KEBApp::KEBApp(
m_bkinfo = new BookmarkInfoWidget(vsplitter);
- vsplitter->setOrientation(TQSplitter::Vertical);
+ vsplitter->setOrientation(Qt::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)
@@ -319,7 +319,7 @@ void KEBApp::slotClipboardDataChanged() {
// kdDebug() << "KEBApp::slotClipboardDataChanged" << endl;
if (!m_readOnly) {
m_canPaste = KBookmarkDrag::canDecode(
- kapp->clipboard()->data(QClipboard::Clipboard));
+ kapp->tqclipboard()->data(QClipboard::Clipboard));
updateActions();
}
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-01 19:12:25 +0000