diff options
Diffstat (limited to 'konqueror/keditbookmarks')
26 files changed, 128 insertions, 172 deletions
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 1313ccd38..395da6a5d 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* 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> @@ -80,136 +78,136 @@ void KEBApp::createActions() { // save and quit should probably not be in the toplevel??? (void) KStdAction::quit( - TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); + this, TQ_SLOT( close() ), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); (void) KStdAction::configureToolbars( - TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection()); + this, TQ_SLOT( slotConfigureToolbars() ), actionCollection()); if (m_browser) { (void) KStdAction::open( - TQT_TQOBJECT(actn), TQT_SLOT( slotLoad() ), actionCollection()); + actn, TQ_SLOT( slotLoad() ), actionCollection()); (void) KStdAction::saveAs( - TQT_TQOBJECT(actn), TQT_SLOT( slotSaveAs() ), actionCollection()); + actn, TQ_SLOT( slotSaveAs() ), 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()); + (void) KStdAction::cut(actn, TQ_SLOT( slotCut() ), actionCollection()); + (void) KStdAction::copy(actn, TQ_SLOT( slotCopy() ), actionCollection()); + (void) KStdAction::paste(actn, TQ_SLOT( slotPaste() ), actionCollection()); + (void) KStdAction::print(actn, TQ_SLOT( slotPrint() ), actionCollection()); // settings menu (void) new TDEToggleAction( i18n("&Show Netscape Bookmarks in Konqueror"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(), + actn, TQ_SLOT( slotShowNS() ), actionCollection(), "settings_showNS"); // actions (void) new TDEAction( i18n("&Delete"), "edit-delete", Key_Delete, - TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete"); + actn, TQ_SLOT( slotDelete() ), actionCollection(), "delete"); (void) new TDEAction( i18n("Rename"), "text", Key_F2, - TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename"); + actn, TQ_SLOT( slotRename() ), actionCollection(), "rename"); (void) new TDEAction( i18n("C&hange URL"), "text", Key_F3, - TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); + actn, TQ_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); (void) new TDEAction( i18n("C&hange Comment"), "text", Key_F4, - TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); + actn, TQ_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); (void) new TDEAction( i18n("Chan&ge Icon..."), "icons", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); + actn, TQ_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); (void) new TDEAction( i18n("Update Favicon"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); + actn, TQ_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); (void) new TDEAction( i18n("Recursive Sort"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); + actn, TQ_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); (void) new TDEAction( i18n("&New Folder..."), "folder-new", CTRL+Key_N, - TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); + actn, TQ_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); (void) new TDEAction( i18n("&New Bookmark"), "www", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); + actn, TQ_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); (void) new TDEAction( i18n("&Insert Separator"), CTRL+Key_I, - TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(), + actn, TQ_SLOT( slotInsertSeparator() ), actionCollection(), "insertseparator"); (void) new TDEAction( i18n("&Sort Alphabetically"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort"); + actn, TQ_SLOT( slotSort() ), actionCollection(), "sort"); (void) new TDEAction( i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); + actn, TQ_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); (void) new TDEAction( i18n("Show in T&oolbar"), "bookmark_toolbar", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); + actn, TQ_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); (void) new TDEAction( i18n("Hide in T&oolbar"), "bookmark_toolbar", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); + actn, TQ_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); (void) new TDEAction( i18n("&Expand All Folders"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); + actn, TQ_SLOT( slotExpandAll() ), actionCollection(), "expandall"); (void) new TDEAction( i18n("Collapse &All Folders"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); + actn, TQ_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); (void) new TDEAction( i18n("&Open in Konqueror"), "document-open", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); + actn, TQ_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); (void) new TDEAction( i18n("Check &Status"), "bookmark", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); + actn, TQ_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); (void) new TDEAction( i18n("Check Status: &All"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); + actn, TQ_SLOT( slotTestAll() ), actionCollection(), "testall" ); (void) new TDEAction( i18n("Update All &Favicons"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), + actn, TQ_SLOT( slotUpdateAllFavIcons() ), actionCollection(), "updateallfavicons" ); (void) new TDEAction( i18n("Cancel &Checks"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); + actn, TQ_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); (void) new TDEAction( i18n("Cancel &Favicon Updates"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), + actn, TQ_SLOT( slotCancelFavIconUpdates() ), actionCollection(), "cancelfaviconupdates" ); (void) new TDEAction( i18n("Import &Netscape Bookmarks..."), "netscape", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importNS"); (void) new TDEAction( i18n("Import &Opera Bookmarks..."), "opera", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importOpera"); (void) new TDEAction( i18n("Import All &Crash Sessions as Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importCrashes"); (void) new TDEAction( i18n("Import &Galeon Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importGaleon"); (void) new TDEAction( i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importKDE2"); (void) new TDEAction( i18n("Import &IE Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importIE"); (void) new TDEAction( i18n("Import &Mozilla Bookmarks..."), "mozilla", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importMoz"); (void) new TDEAction( i18n("Export to &Netscape Bookmarks"), "netscape", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); + actn, TQ_SLOT( slotExportNS() ), actionCollection(), "exportNS"); (void) new TDEAction( i18n("Export to &Opera Bookmarks..."), "opera", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); + actn, TQ_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); (void) new TDEAction( i18n("Export to &HTML Bookmarks..."), "text-html", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); + actn, TQ_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); (void) new TDEAction( i18n("Export to &IE Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); + actn, TQ_SLOT( slotExportIE() ), actionCollection(), "exportIE"); (void) new TDEAction( i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); + actn, TQ_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); } void ActionsImpl::slotLoad() { @@ -394,7 +392,7 @@ void ActionsImpl::slotImport() { // kdDebug() << "ActionsImpl::slotImport() where sender()->name() == " // << sender()->name() << endl; ImportCommand* import - = ImportCommand::performImport(TQT_TQOBJECT_CONST(sender())->name()+6, KEBApp::self()); + = ImportCommand::performImport(sender()->name()+6, KEBApp::self()); if (!import) return; CmdHistory::self()->addCommand(import); @@ -446,7 +444,7 @@ void ActionsImpl::slotPrint() { s_appId = kapp->dcopClient()->appId(); s_objId = s_part->property("dcopObjectId").toString().latin1(); - connect(s_part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotDelayedPrint())); + connect(s_part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotDelayedPrint())); s_part->openURL(KURL( tmpf.name() )); } diff --git a/konqueror/keditbookmarks/actionsimpl.h b/konqueror/keditbookmarks/actionsimpl.h index 11cd70d57..f0137245b 100644 --- a/konqueror/keditbookmarks/actionsimpl.h +++ b/konqueror/keditbookmarks/actionsimpl.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -23,9 +21,9 @@ #include <tqobject.h> -class ActionsImpl : public QObject +class ActionsImpl : public TQObject { - Q_OBJECT + TQ_OBJECT public: bool save(); diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp index 95ae0707f..45da6db7a 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.cpp +++ b/konqueror/keditbookmarks/bookmarkinfo.cpp @@ -1,4 +1,3 @@ -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -232,7 +231,7 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) : TQWidget(parent, name), m_connected(false) { timer = new TQTimer(this); - connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( commitChanges())); + connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( commitChanges())); titlecmd = 0; urlcmd = 0; @@ -247,9 +246,9 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) new TQLabel(m_title_le, i18n("Name:"), this), 0, 0); - connect(m_title_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedTitle(const TQString &) )); - connect(m_title_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitTitle() )); + connect(m_title_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedTitle(const TQString &) )); + connect(m_title_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitTitle() )); m_url_le = new BookmarkLineEdit(this); grid->addWidget(m_url_le, 1, 1); @@ -257,18 +256,18 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) new TQLabel(m_url_le, i18n("Location:"), this), 1, 0); - connect(m_url_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedURL(const TQString &) )); - connect(m_url_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitURL() )); + connect(m_url_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedURL(const TQString &) )); + connect(m_url_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitURL() )); m_comment_le = new BookmarkLineEdit(this); grid->addWidget(m_comment_le, 2, 1); grid->addWidget( new TQLabel(m_comment_le, i18n("Comment:"), this), 2, 0); - connect(m_comment_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedComment(const TQString &) )); - connect(m_comment_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitComment() )); + connect(m_comment_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedComment(const TQString &) )); + connect(m_comment_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitComment() )); m_credate_le = new KLineEdit(this); grid->addWidget(m_credate_le, 0, 3); diff --git a/konqueror/keditbookmarks/bookmarkinfo.h b/konqueror/keditbookmarks/bookmarkinfo.h index 8565616ed..782a7ece7 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.h +++ b/konqueror/keditbookmarks/bookmarkinfo.h @@ -1,4 +1,3 @@ -// vim: set ts=4 sts=4 sw=4 et: /* 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> @@ -30,7 +29,7 @@ class TQTimer; class BookmarkLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: BookmarkLineEdit( TQWidget * ); public slots: @@ -39,7 +38,7 @@ public slots: class BookmarkInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: BookmarkInfoWidget(TQWidget * = 0, const char * = 0); void showBookmark(const KBookmark &bk); diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp index c30d890e3..35374136f 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.cpp +++ b/konqueror/keditbookmarks/bookmarkiterator.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* 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> @@ -29,8 +27,8 @@ #include <tqtimer.h> BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) { - connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ), - TQT_SLOT( slotCancelTest(BookmarkIterator *) )); + connect(this, TQ_SIGNAL( deleteSelf(BookmarkIterator *) ), + TQ_SLOT( slotCancelTest(BookmarkIterator *) )); delayedEmitNextOne(); } @@ -39,7 +37,7 @@ BookmarkIterator::~BookmarkIterator() { } void BookmarkIterator::delayedEmitNextOne() { - TQTimer::singleShot(1, this, TQT_SLOT( nextOne() )); + TQTimer::singleShot(1, this, TQ_SLOT( nextOne() )); } void BookmarkIterator::slotCancelTest(BookmarkIterator *test) { diff --git a/konqueror/keditbookmarks/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h index 0931ccaf7..8f5df481a 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.h +++ b/konqueror/keditbookmarks/bookmarkiterator.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -28,9 +26,9 @@ class KEBListViewItem; class BookmarkIteratorHolder; -class BookmarkIterator : public QObject +class BookmarkIterator : public TQObject { - Q_OBJECT + TQ_OBJECT public: BookmarkIterator(TQValueList<KBookmark> bks); diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp index f69c01ca5..6f228e565 100644 --- a/konqueror/keditbookmarks/commands.cpp +++ b/konqueror/keditbookmarks/commands.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* 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/commands.h b/konqueror/keditbookmarks/commands.h index 84268a698..92e56bed5 100644 --- a/konqueror/keditbookmarks/commands.h +++ b/konqueror/keditbookmarks/commands.h @@ -1,4 +1,3 @@ -// 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 570445cae..b02f0af16 100644 --- a/konqueror/keditbookmarks/dcop.cpp +++ b/konqueror/keditbookmarks/dcop.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* 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> @@ -39,8 +37,8 @@ KBookmarkEditorIface::KBookmarkEditorIface() : TQObject(), DCOPObject("KBookmarkEditor") { - // connect(KBookmarkNotifier_stub, TQT_SIGNAL( updatedAccessMetadata(TQString,TQString) ), - // this, TQT_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) )); + // connect(KBookmarkNotifier_stub, TQ_SIGNAL( updatedAccessMetadata(TQString,TQString) ), + // this, TQ_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) )); connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(TQString,TQString)", "slotDcopUpdatedAccessMetadata(TQString,TQString)", false); } diff --git a/konqueror/keditbookmarks/dcop.h b/konqueror/keditbookmarks/dcop.h index 6914f2db4..441ff8c9e 100644 --- a/konqueror/keditbookmarks/dcop.h +++ b/konqueror/keditbookmarks/dcop.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -25,7 +23,7 @@ class KBookmarkEditorIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: KBookmarkEditorIface(); diff --git a/konqueror/keditbookmarks/exporters.cpp b/konqueror/keditbookmarks/exporters.cpp index 681883883..1865986b6 100644 --- a/konqueror/keditbookmarks/exporters.cpp +++ b/konqueror/keditbookmarks/exporters.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp index f4e2183ea..73cbd9ced 100644 --- a/konqueror/keditbookmarks/favicons.cpp +++ b/konqueror/keditbookmarks/favicons.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -85,9 +83,9 @@ void FavIconsItr::doAction() { // kdDebug() << "FavIconsItr::doAction()" << endl; curItem()->setTmpStatus(i18n("Updating favicon...")); if (!m_updater) { - m_updater = new FavIconUpdater(TQT_TQOBJECT(kapp), "FavIconUpdater"); - connect(m_updater, TQT_SIGNAL( done(bool) ), - this, TQT_SLOT( slotDone(bool) ) ); + m_updater = new FavIconUpdater(kapp, "FavIconUpdater"); + connect(m_updater, TQ_SIGNAL( done(bool) ), + this, TQ_SLOT( slotDone(bool) ) ); } if (curBk().url().protocol().startsWith("http")) { m_updater->downloadIcon(curBk()); diff --git a/konqueror/keditbookmarks/favicons.h b/konqueror/keditbookmarks/favicons.h index 3be46d35f..a2e4036bc 100644 --- a/konqueror/keditbookmarks/favicons.h +++ b/konqueror/keditbookmarks/favicons.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -47,7 +45,7 @@ class FavIconUpdater; class FavIconsItr : public BookmarkIterator { - Q_OBJECT + TQ_OBJECT public: FavIconsItr(TQValueList<KBookmark> bks); diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp index e809a12e0..104db0048 100644 --- a/konqueror/keditbookmarks/importers.cpp +++ b/konqueror/keditbookmarks/importers.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* 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/importers.h b/konqueror/keditbookmarks/importers.h index 0550e46f0..fd6aec917 100644 --- a/konqueror/keditbookmarks/importers.h +++ b/konqueror/keditbookmarks/importers.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* 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> @@ -35,7 +33,7 @@ // part pure class ImportCommand : public TQObject, public KCommand, public IKEBCommand { - Q_OBJECT + TQ_OBJECT public: ImportCommand() : KCommand(), m_utf8(false), m_folder(false), m_cleanUpCmd(0L) diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h index c7031a377..36e94f535 100644 --- a/konqueror/keditbookmarks/kebsearchline.h +++ b/konqueror/keditbookmarks/kebsearchline.h @@ -24,7 +24,7 @@ class KEBSearchLine : public TDEListViewSearchLine { - Q_OBJECT + TQ_OBJECT public: KEBSearchLine(TQWidget *parent = 0, TDEListView *listView = 0, const char *name = 0); diff --git a/konqueror/keditbookmarks/kinsertionsort.h b/konqueror/keditbookmarks/kinsertionsort.h index 5f71184ed..67645db16 100644 --- a/konqueror/keditbookmarks/kinsertionsort.h +++ b/konqueror/keditbookmarks/kinsertionsort.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 92eb1c48b..f5a8474cc 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* 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> @@ -231,8 +229,8 @@ void ListView::selected(KEBListViewItem * item, bool s) } //FIXME do it once somewhere if (!KEBApp::self()->bkInfo()->connected()) { - connect(KEBApp::self()->bkInfo(), TQT_SIGNAL( updateListViewItem() ), - TQT_SLOT( slotBkInfoUpdateListViewItem() )); + connect(KEBApp::self()->bkInfo(), TQ_SIGNAL( updateListViewItem() ), + TQ_SLOT( slotBkInfoUpdateListViewItem() )); KEBApp::self()->bkInfo()->setConnected(true); } @@ -648,7 +646,7 @@ class KeyPressEater : public TQObject { bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) { if (pe->type() == TQEvent::KeyPress) { TQKeyEvent *k = (TQKeyEvent *) pe; - if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab) + if ((k->key() == TQt::Key_Backtab || k->key() == TQt::Key_Tab) && !(k->state() & ControlButton || k->state() & AltButton) ) { if (m_allowedToTab) { @@ -657,7 +655,7 @@ bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) { } return true; } else { - m_allowedToTab = (k->key() == Qt::Key_Escape || k->key() == Qt::Key_Enter); + m_allowedToTab = (k->key() == TQt::Key_Escape || k->key() == TQt::Key_Enter); } } return false; @@ -718,21 +716,21 @@ void KEBListView::init() { setDragEnabled(true); setSelectionModeExt((!m_folderList) ? TDEListView::Extended: TDEListView::Single); setAllColumnsShowFocus(true); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(slotColumnSizeChanged(int, int, int))); } void KEBListView::makeConnections() { - connect(this, TQT_SIGNAL( moved() ), - TQT_SLOT( slotMoved() )); - connect(this, TQT_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ), - TQT_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) )); - connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), - TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); - connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), - TQT_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) )); - connect(this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), - TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) )); + connect(this, TQ_SIGNAL( moved() ), + TQ_SLOT( slotMoved() )); + connect(this, TQ_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ), + TQ_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) )); + connect(this, TQ_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), + TQ_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); + connect(this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), + TQ_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) )); + connect(this, TQ_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), + TQ_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) )); } void KEBListView::readonlyFlagInit(bool readonly) { @@ -913,7 +911,7 @@ void KEBListViewItem::setOpen(bool open) { void KEBListViewItem::greyStyle(TQColorGroup &cg) { int h, s, v; cg.background().hsv(&h, &s, &v); - TQColor color = (v > 180 && v < 220) ? (Qt::darkGray) : (Qt::gray); + TQColor color = (v > 180 && v < 220) ? (TQt::darkGray) : (TQt::gray); cg.setColor(TQColorGroup::Text, color); } diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h index f693c608f..15444c2a5 100644 --- a/konqueror/keditbookmarks/listview.h +++ b/konqueror/keditbookmarks/listview.h @@ -1,4 +1,3 @@ -// 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> @@ -82,7 +81,7 @@ private: class KEBListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: enum { NameColumn = 0, @@ -129,7 +128,7 @@ private: // DESIGN - make some stuff private if possible class ListView : public TQObject { - Q_OBJECT + TQ_OBJECT public: // init stuff void initListViews(); diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index d64f6bce7..94e08a357 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* 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/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp index 5a7b5ce04..707491741 100644 --- a/konqueror/keditbookmarks/testlink.cpp +++ b/konqueror/keditbookmarks/testlink.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* 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> @@ -90,10 +88,10 @@ void TestLinkItr::doAction() { m_job->addMetaData("errorPage", "true"); m_job->addMetaData( TQString("cookies"), TQString("none") ); - connect(m_job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotJobResult(TDEIO::Job *))); - connect(m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotJobResult(TDEIO::Job *))); + connect(m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &))); curItem()->setTmpStatus(i18n("Checking...")); TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url()); diff --git a/konqueror/keditbookmarks/testlink.h b/konqueror/keditbookmarks/testlink.h index a224279df..831029c25 100644 --- a/konqueror/keditbookmarks/testlink.h +++ b/konqueror/keditbookmarks/testlink.h @@ -53,7 +53,7 @@ private: class TestLinkItr : public BookmarkIterator { - Q_OBJECT + TQ_OBJECT public: TestLinkItr(TQValueList<KBookmark> bks); diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index d5a7c865c..d685e8dee 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* 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> @@ -60,8 +58,8 @@ CmdHistory* CmdHistory::s_self = 0; CmdHistory::CmdHistory(TDEActionCollection *collection) : m_commandHistory(collection) { - connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ), - TQT_SLOT( slotCommandExecuted(KCommand *) )); + connect(&m_commandHistory, TQ_SIGNAL( commandExecuted(KCommand *) ), + TQ_SLOT( slotCommandExecuted(KCommand *) )); assert(!s_self); s_self = this; // this is hacky } @@ -140,8 +138,8 @@ void CurrentMgr::createManager(const TQString &filename) { m_mgr = KBookmarkManager::managerForFile(filename, false); - connect(m_mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) )); + connect(m_mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) )); } void CurrentMgr::slotBookmarksChanged(const TQString &, const TQString &) { @@ -185,7 +183,7 @@ TQString CurrentMgr::makeTimeStr(int b) TQDateTime dt; dt.setTime_t(b); return (dt.daysTo(TQDateTime::currentDateTime()) > 31) - ? TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false) + ? TDEGlobal::locale()->formatDate(dt.date(), false) : TDEGlobal::locale()->formatDateTime(dt, false); } @@ -221,8 +219,8 @@ KEBApp::KEBApp( TDEListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "TDEListViewSearchLine"); quicksearch->setStretchableWidget(searchLineEdit); lbl->setBuddy(searchLineEdit); - connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear())); - connect(searchLineEdit, TQT_SIGNAL(searchUpdated()), TQT_SLOT(updateActions())); + connect(resetQuickSearch, TQ_SIGNAL(activated()), searchLineEdit, TQ_SLOT(clear())); + connect(searchLineEdit, TQ_SIGNAL(searchUpdated()), TQ_SLOT(updateActions())); ListView::createListViews(vsplitter); ListView::self()->initListViews(); @@ -231,7 +229,7 @@ KEBApp::KEBApp( m_bkinfo = new BookmarkInfoWidget(vsplitter); - vsplitter->setOrientation(Qt::Vertical); + vsplitter->setOrientation(TQt::Vertical); vsplitter->setSizes(TQValueList<int>() << h << 380 << m_bkinfo->sizeHint().height() ); @@ -247,8 +245,8 @@ KEBApp::KEBApp( m_dcopIface = new KBookmarkEditorIface(); - connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( slotClipboardDataChanged() )); + connect(kapp->clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( slotClipboardDataChanged() )); ListView::self()->connectSignals(); @@ -339,8 +337,8 @@ void KEBApp::notifyCommandExecuted() { void KEBApp::slotConfigureToolbars() { saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), - TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), + TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h index 7dd056d8d..33a60073e 100644 --- a/konqueror/keditbookmarks/toplevel.h +++ b/konqueror/keditbookmarks/toplevel.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* 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> @@ -46,7 +44,7 @@ struct SelcAbilities { }; class CmdHistory : public TQObject { - Q_OBJECT + TQ_OBJECT public: CmdHistory(TDEActionCollection *collection); virtual ~CmdHistory() { ; } @@ -74,7 +72,7 @@ class KBookmark; class KBookmarkManager; class CurrentMgr : public TQObject { - Q_OBJECT + TQ_OBJECT public: typedef enum {HTMLExport, OperaExport, IEExport, MozillaExport, NetscapeExport} ExportType; @@ -109,7 +107,7 @@ private: }; class KEBApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: static KEBApp* self() { return s_topLevel; } diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index ad55793e0..377026411 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -1,5 +1,3 @@ -// -*- indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -97,10 +95,10 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { part->setProperty("javaEnabled", TQVariant(false)); part->setProperty("autoloadImages", TQVariant(false)); - connect(part, TQT_SIGNAL( canceled(const TQString &) ), - this, TQT_SLOT( slotCompleted() )); - connect(part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() )); + connect(part, TQ_SIGNAL( canceled(const TQString &) ), + this, TQ_SLOT( slotCompleted() )); + connect(part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() )); KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part); assert(ext); @@ -108,8 +106,8 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { m_browserIface = new FavIconBrowserInterface(this, "browseriface"); ext->setBrowserInterface(m_browserIface); - connect(ext, TQT_SIGNAL( setIconURL(const KURL &) ), - this, TQT_SLOT( setIconURL(const KURL &) )); + connect(ext, TQ_SIGNAL( setIconURL(const KURL &) ), + this, TQ_SLOT( setIconURL(const KURL &) )); m_part = part; } @@ -117,7 +115,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { if (!m_timer) { // Timeout to stop the updating hanging m_timer = new TQTimer(this); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); } m_timer->start(15000,false); m_webGrabber = new FavIconWebGrabber(m_part, bk.url()); @@ -151,10 +149,10 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url TDEIO::Job *job = TDEIO::get(m_url, false, false); job->addMetaData( TQString("cookies"), TQString("none") ); - connect(job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotFinished(TDEIO::Job *) )); - connect(job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) )); + connect(job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotFinished(TDEIO::Job *) )); + connect(job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) )); } void FavIconWebGrabber::slotMimetype(TDEIO::Job *job, const TQString & /*type*/) { diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h index 44a19af40..0e0e8b336 100644 --- a/konqueror/keditbookmarks/updater.h +++ b/konqueror/keditbookmarks/updater.h @@ -1,5 +1,3 @@ -// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -27,9 +25,9 @@ #include <tdeparts/part.h> #include <tdeparts/browserinterface.h> -class FavIconWebGrabber : public QObject +class FavIconWebGrabber : public TQObject { - Q_OBJECT + TQ_OBJECT public: FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url); ~FavIconWebGrabber() {} @@ -47,7 +45,7 @@ class FavIconBrowserInterface; class FavIconUpdater : public KonqFavIconMgr { - Q_OBJECT + TQ_OBJECT public: FavIconUpdater(TQObject *parent, const char *name); @@ -77,7 +75,7 @@ private: class FavIconBrowserInterface : public KParts::BrowserInterface { - Q_OBJECT + TQ_OBJECT public: FavIconBrowserInterface(FavIconUpdater *view, const char *name) : KParts::BrowserInterface(view, name), m_view(view) { |