diff options
Diffstat (limited to 'akregator/src')
178 files changed, 1150 insertions, 1099 deletions
diff --git a/akregator/src/aboutdata.cpp b/akregator/src/aboutdata.cpp index a2a747543..438f81a66 100644 --- a/akregator/src/aboutdata.cpp +++ b/akregator/src/aboutdata.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqstring.h> diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h index 56223d15f..8f88079ea 100644 --- a/akregator/src/aboutdata.h +++ b/akregator/src/aboutdata.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ABOUTDATA_H diff --git a/akregator/src/actionmanager.cpp b/akregator/src/actionmanager.cpp index 225f85d7f..5598457aa 100644 --- a/akregator/src/actionmanager.cpp +++ b/akregator/src/actionmanager.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "actionmanager.h" @@ -43,7 +43,7 @@ void ActionManager::setInstance(ActionManager* manager) } -ActionManager::ActionManager(TQObject* parent, const char* name) : TQObject(parent, name), d(new ActionManagerPrivate) +ActionManager::ActionManager(TQObject* tqparent, const char* name) : TQObject(tqparent, name), d(new ActionManagerPrivate) {} ActionManager::~ActionManager() diff --git a/akregator/src/actionmanager.h b/akregator/src/actionmanager.h index 17dae1fab..bcdba56bc 100644 --- a/akregator/src/actionmanager.h +++ b/akregator/src/actionmanager.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_ACTIONMANAGER_H @@ -36,14 +36,14 @@ namespace Akregator { /** interface for accessing actions, popup menus etc. from widgets. (Extracted from the implementation to avoid dependencies between widgets and Akregator::Part). */ -class ActionManager : public QObject +class ActionManager : public TQObject { public: static ActionManager* getInstance(); static void setInstance(ActionManager* manager); - ActionManager(TQObject* parent=0, const char* name=0); + ActionManager(TQObject* tqparent=0, const char* name=0); virtual ~ActionManager(); virtual KAction* action(const char* name, const char* classname=0) = 0; diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 18523993d..bb4741edb 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqwidget.h> @@ -89,7 +89,7 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor { KAction* remove = m_manager->action("feed_remove"); if (remove) - remove->setEnabled(node->parent()); // root nodes must not be deleted + remove->setEnabled(node->tqparent()); // root nodes must not be deleted KAction* hp = m_manager->action("feed_homepage"); if (hp) hp->setEnabled(false); @@ -222,7 +222,7 @@ void ActionManagerImpl::slotNodeSelected(TreeNode* node) d->nodeSelectVisitor->visit(node); } -ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* parent, const char* name) : ActionManager(parent, name), d(new ActionManagerImplPrivate) +ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* tqparent, const char* name) : ActionManager(tqparent, name), d(new ActionManagerImplPrivate) { d->nodeSelectVisitor = new NodeSelectVisitor(this); d->part = part; @@ -314,13 +314,13 @@ void ActionManagerImpl::initView(View* view) new KAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read"); // Settings menu - KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString::null, 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter"); + KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter"); sqf->setChecked( Settings::showQuickFilter() ); new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" ); - new KAction( i18n("Open in Background Tab"), TQString::null, "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" ); + new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" ); new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" ); - new KAction( i18n("Copy Link Address"), TQString::null, TQString::null, d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" ); + new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" ); new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article"); new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article"); @@ -364,10 +364,10 @@ void ActionManagerImpl::initView(View* view) connect(importantAction, TQT_SIGNAL(toggled(bool)), d->view, TQT_SLOT(slotArticleToggleKeepFlag(bool))); - new KAction( i18n("Move Node Up"), TQString::null, "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" ); - new KAction( i18n("Move Node Down"), TQString::null, "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" ); - new KAction( i18n("Move Node Left"), TQString::null, "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" ); - new KAction( i18n("Move Node Right"), TQString::null, "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right"); + new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" ); + new KAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" ); + new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" ); + new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right"); } void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer) @@ -385,8 +385,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList) else d->articleList = articleList; - new KAction( i18n("&Previous Article"), TQString::null, "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" ); - new KAction( i18n("&Next Article"), TQString::null, "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" ); + new KAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" ); + new KAction( i18n("&Next Article"), TQString(), "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" ); } void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget) @@ -401,12 +401,12 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget) new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed"); new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed"); - new KAction( i18n("Go to Top of Tree"), TQString::null, "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" ); - new KAction( i18n("Go to Bottom of Tree"), TQString::null, "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" ); - new KAction( i18n("Go Left in Tree"), TQString::null, "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" ); - new KAction( i18n("Go Right in Tree"), TQString::null, "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" ); - new KAction( i18n("Go Up in Tree"), TQString::null, "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" ); - new KAction( i18n("Go Down in Tree"), TQString::null, "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" ); + new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" ); + new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" ); + new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" ); + new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" ); + new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" ); + new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" ); } void ActionManagerImpl::initTabWidget(TabWidget* tabWidget) @@ -419,7 +419,7 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget) new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab"); new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab"); new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" ); - new KAction( i18n("Copy Link Address"), TQString::null, TQString::null, d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" ); + new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" ); new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), d->tabWidget, TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" ); } diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h index 871edc94b..398135c64 100644 --- a/akregator/src/actionmanagerimpl.h +++ b/akregator/src/actionmanagerimpl.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_ACTIONMANAGERIMPL_H @@ -50,9 +50,10 @@ class TabWidget; class ActionManagerImpl : public ActionManager { Q_OBJECT + TQ_OBJECT public: - ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0); + ActionManagerImpl(Part* part, TQObject* tqparent=0, const char* name=0); virtual ~ActionManagerImpl(); virtual KAction* action(const char* name, const char* classname=0); diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index cc10844b5..78a801039 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "feed.h" @@ -39,18 +39,18 @@ namespace Akregator { -AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name) - : AddFeedWidgetBase(parent, name) +AddFeedWidget::AddFeedWidget(TQWidget *tqparent, const char *name) + : AddFeedWidgetBase(tqparent, name) { pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "package_network",KIcon::Desktop,KIcon::SizeHuge, KIcon::DefaultState, 0, true)); - statusLabel->setText(TQString::null); + statusLabel->setText(TQString()); } AddFeedWidget::~AddFeedWidget() {} -AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name) - : KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel) +AddFeedDialog::AddFeedDialog(TQWidget *tqparent, const char *name) + : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel) { widget = new AddFeedWidget(this); connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&))); @@ -79,7 +79,7 @@ void AddFeedDialog::slotOk( ) if (feedURL.startsWith("feed:")) feedURL = feedURL.right( feedURL.length() - 5 ); - if (feedURL.find(":/") == -1) + if (feedURL.tqfind(":/") == -1) feedURL.prepend("http://"); f->setXmlUrl(feedURL); diff --git a/akregator/src/addfeeddialog.h b/akregator/src/addfeeddialog.h index fc38e6175..1152f3d09 100644 --- a/akregator/src/addfeeddialog.h +++ b/akregator/src/addfeeddialog.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORADDFEEDDIALOG_H @@ -41,16 +41,18 @@ namespace Akregator class AddFeedWidget : public AddFeedWidgetBase { Q_OBJECT + TQ_OBJECT public: - AddFeedWidget(TQWidget *parent = 0, const char *name = 0); + AddFeedWidget(TQWidget *tqparent = 0, const char *name = 0); ~AddFeedWidget(); }; class AddFeedDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AddFeedDialog(TQWidget *parent = 0, const char *name = 0); + AddFeedDialog(TQWidget *tqparent = 0, const char *name = 0); ~AddFeedDialog(); void setURL(const TQString& t); diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui index 09c10fa49..5bdcfdc72 100644 --- a/akregator/src/addfeedwidgetbase.ui +++ b/akregator/src/addfeedwidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>Akregator::AddFeedWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AddFeedWidget</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout16</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel1</cstring> </property> @@ -63,7 +63,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout15</cstring> </property> @@ -82,7 +82,7 @@ </size> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -95,7 +95,7 @@ <string>Add New Source</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -115,7 +115,7 @@ <cstring>statusLabel</cstring> </property> <property name="text"> - <string>Status</string> + <string>tqStatus</string> </property> </widget> <spacer> diff --git a/akregator/src/akregator_options.h b/akregator/src/akregator_options.h index 2b4334baf..3d2c20058 100644 --- a/akregator/src/akregator_options.h +++ b/akregator/src/akregator_options.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_OPTIONS_H diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index aafb17bec..2b0f73e79 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <dcopclient.h> #include <kaboutdata.h> @@ -117,9 +117,9 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor }; Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/, - TQObject *parent, const char *name, const TQStringList& ) + TQObject *tqparent, const char *name, const TQStringList& ) : DCOPObject("AkregatorIface") - , MyBasePart(parent, name) + , MyBasePart(tqparent, name) , m_standardListLoaded(false) , m_shuttingDown(false) , m_mergedPart(0) @@ -416,7 +416,7 @@ bool Part::openFile() { if (file.open(IO_ReadOnly)) { - // Read OPML feeds list and build QDom tree. + // Read OPML feeds list and build TQDom tree. TQTextStream stream(&file); stream.setEncoding(TQTextStream::UnicodeUTF8); // FIXME not all opmls are in utf8 str = stream.read(); @@ -452,7 +452,7 @@ bool Part::openFile() m_view->loadFeeds(createDefaultFeedList()); } - emit setStatusBarText(TQString::null); + emit setStatusBarText(TQString()); if( Settings::markAllFeedsReadOnStartup() ) @@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part) { if (m_mergedPart) { factory()->removeClient(m_mergedPart); - if (childClients()->tqcontainsRef(m_mergedPart)) + if (childClients()->containsRef(m_mergedPart)) removeChildClient(m_mergedPart); } if (part) @@ -634,7 +634,7 @@ void Part::importFile(const KURL& url) TQFile file(filename); if (file.open(IO_ReadOnly)) { - // Read OPML feeds list and build QDom tree. + // Read OPML feeds list and build TQDom tree. TQDomDocument doc; if (doc.setContent(file.readAll())) m_view->importFeeds(doc); @@ -692,7 +692,7 @@ void Part::exportFile(const KURL& url) void Part::fileImport() { - KURL url = KFileDialog::getOpenURL( TQString::null, + KURL url = KFileDialog::getOpenURL( TQString(), "*.opml *.xml|" + i18n("OPML Outlines (*.opml, *.xml)") +"\n*|" + i18n("All Files") ); @@ -702,7 +702,7 @@ void Part::fileImport() void Part::fileExport() { - KURL url= KFileDialog::getSaveURL( TQString::null, + KURL url= KFileDialog::getSaveURL( TQString(), "*.opml *.xml|" + i18n("OPML Outlines (*.opml, *.xml)") +"\n*|" + i18n("All Files") ); @@ -979,8 +979,8 @@ bool Part::tryToLock(const TQString& backendName) "You should disable the archive for now " "unless you are sure that %2 is not already running.</qt>") .arg( programName, programName, backendName ); - // TQString::arg( st ) only tqreplaces the first occurrence of %1 - // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences + // TQString::arg( st ) only replaces the first occurrence of %1 + // with st while TQString::arg( s1, s2 ) replacess all occurrences // of %1 with s1 and all occurrences of %2 with s2. So don't // even think about changing the above to .arg( programName ). else @@ -1014,7 +1014,7 @@ bool Part::tryToLock(const TQString& backendName) KCursorSaver idle( KBusyPtr::idle() ); if ( KMessageBox::No == - KMessageBox::warningYesNo( 0, msg, TQString::null, + KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Force Access"), i18n("Disable Archive")) ) { diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index 487b001de..43404a179 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _AKREGATORPART_H_ @@ -60,6 +60,7 @@ namespace Akregator class BrowserExtension : public KParts::BrowserExtension { Q_OBJECT + TQ_OBJECT public: BrowserExtension(Part *p, const char *name ); @@ -76,12 +77,13 @@ namespace Akregator class Part : public MyBasePart, virtual public AkregatorPartIface { Q_OBJECT + TQ_OBJECT public: typedef MyBasePart inherited; /** Default constructor.*/ Part(TQWidget *tqparentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList&); + TQObject *tqparent, const char *name, const TQStringList&); /** Destructor. */ virtual ~Part(); diff --git a/akregator/src/akregator_partiface.h b/akregator/src/akregator_partiface.h index 5bb51075b..28fed0d04 100644 --- a/akregator/src/akregator_partiface.h +++ b/akregator/src/akregator_partiface.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORPARTIFACE_H diff --git a/akregator/src/akregator_run.cpp b/akregator/src/akregator_run.cpp index 4b67113ce..84fd65720 100644 --- a/akregator/src/akregator_run.cpp +++ b/akregator/src/akregator_run.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kdebug.h> diff --git a/akregator/src/akregator_run.h b/akregator/src/akregator_run.h index db257fed8..35e80e4cf 100644 --- a/akregator/src/akregator_run.h +++ b/akregator/src/akregator_run.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_RUN_H @@ -35,6 +35,7 @@ class Viewer; class BrowserRun : public KParts::BrowserRun { Q_OBJECT + TQ_OBJECT public: /** indicates how HTML pages should be opened. It is passed in the constructor and sent back via the openInViewer signal. This is a workaround to fix opening of non-HTML mimetypes in 3.5, which will be refactored for KDE4 anyway. For 3.5.x it's the easiest way to fix the problem without changing too much code TODO KDE4: refactor, remove this enum */ enum OpeningMode diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 59457286a..0d9b56afd 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "actionmanagerimpl.h" @@ -210,8 +210,8 @@ View::~View() kdDebug() << "View::~View(): leaving" << endl; } -View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char *name) - : TQWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager) +View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char *name) + : TQWidget(tqparent, name), m_viewMode(NormalView), m_actionManager(actionManager) { m_editNodePropertiesVisitor = new EditNodePropertiesVisitor(this); m_deleteNodeVisitor = new DeleteNodeVisitor(this); @@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons if (!Settings::resetQuickFilterOnNodeChange()) { - m_searchBar->slotSeStatus(Settings::statusFilter()); + m_searchBar->slotSetqStatus(Settings::statusFilter()); m_searchBar->slotSetText(Settings::textFilter()); } @@ -533,7 +533,7 @@ bool View::importFeeds(const TQDomDocument& doc) return true; } -bool View::loadFeeds(const TQDomDocument& doc, Folder* parent) +bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent) { FeedList* feedList = new FeedList(); bool parsed = feedList->readFromXML(doc); @@ -546,7 +546,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent) } m_feedListView->setUpdatesEnabled(false); m_tagNodeListView->setUpdatesEnabled(false); - if (!parent) + if (!tqparent) { TagSet* tagSet = Kernel::self()->tagSet(); @@ -570,7 +570,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent) // create a tag for every tag ID in the archive that is not part of the tagset // this is a fallback in case the tagset was corrupted, // so the tagging information from archive does not get lost. - if (!tagSet->tqcontainsID(*it)) + if (!tagSet->containsID(*it)) { Tag tag(*it, *it); tagSet->insert(tag); @@ -578,7 +578,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent) } } else - m_feedList->append(feedList, parent); + m_feedList->append(feedList, tqparent); m_feedListView->setUpdatesEnabled(true); m_feedListView->triggerUpdate(); @@ -705,7 +705,7 @@ void View::slotFrameChanged(Frame *f) emit signalStarted(0); break; case Frame::Canceled: - emit signalCanceled(TQString::null); + emit signalCanceled(TQString()); break; case Frame::Idle: case Frame::Completed: @@ -725,13 +725,13 @@ void View::slotMoveCurrentNodeUp() if (!current) return; TreeNode* prev = current->prevSibling(); - Folder* parent = current->parent(); + Folder* tqparent = current->tqparent(); - if (!prev || !parent) + if (!prev || !tqparent) return; - parent->removeChild(prev); - parent->insertChild(prev, current); + tqparent->removeChild(prev); + tqparent->insertChild(prev, current); m_listTabWidget->activeView()->ensureNodeVisible(current); } @@ -741,41 +741,41 @@ void View::slotMoveCurrentNodeDown() if (!current) return; TreeNode* next = current->nextSibling(); - Folder* parent = current->parent(); + Folder* tqparent = current->tqparent(); - if (!next || !parent) + if (!next || !tqparent) return; - parent->removeChild(current); - parent->insertChild(current, next); + tqparent->removeChild(current); + tqparent->insertChild(current, next); m_listTabWidget->activeView()->ensureNodeVisible(current); } void View::slotMoveCurrentNodeLeft() { TreeNode* current = m_listTabWidget->activeView()->selectedNode(); - if (!current || !current->parent() || !current->parent()->parent()) + if (!current || !current->tqparent() || !current->tqparent()->tqparent()) return; - Folder* parent = current->parent(); - Folder* grandparent = current->parent()->parent(); + Folder* tqparent = current->tqparent(); + Folder* grandtqparent = current->tqparent()->tqparent(); - parent->removeChild(current); - grandparent->insertChild(current, parent); + tqparent->removeChild(current); + grandtqparent->insertChild(current, tqparent); m_listTabWidget->activeView()->ensureNodeVisible(current); } void View::slotMoveCurrentNodeRight() { TreeNode* current = m_listTabWidget->activeView()->selectedNode(); - if (!current || !current->parent()) + if (!current || !current->tqparent()) return; TreeNode* prev = current->prevSibling(); if ( prev && prev->isGroup() ) { Folder* fg = static_cast<Folder*>(prev); - current->parent()->removeChild(current); + current->tqparent()->removeChild(current); fg->appendChild(current); m_listTabWidget->activeView()->ensureNodeVisible(current); } @@ -880,16 +880,16 @@ void View::slotFeedAdd() if ( m_feedListView->selectedNode()->isGroup()) group = static_cast<Folder*>(m_feedListView->selectedNode()); else - group= m_feedListView->selectedNode()->parent(); + group= m_feedListView->selectedNode()->tqparent(); } - TreeNode* lastChild = group->children().last(); + TreeNode* lastChild = group->tqchildren().last(); - addFeed(TQString::null, lastChild, group, false); + addFeed(TQString(), lastChild, group, false); } -void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool autoExec) +void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool autoExec) { AddFeedDialog *afd = new AddFeedDialog( 0, "add_feed" ); @@ -923,10 +923,10 @@ void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool au return; } - if (!parent) - parent = m_feedList->rootNode(); + if (!tqparent) + tqparent = m_feedList->rootNode(); - parent->insertChild(feed, after); + tqparent->insertChild(feed, after); m_feedListView->ensureNodeVisible(feed); @@ -947,7 +947,7 @@ void View::slotFeedAddGroup() if (!node->isGroup()) { after = node; - node = node->parent(); + node = node->tqparent(); } Folder* currentGroup = static_cast<Folder*> (node); @@ -1077,7 +1077,7 @@ void View::slotFetchingStopped() { m_mainFrame->setState(Frame::Completed); m_actionManager->action("feed_stop")->setEnabled(false); - m_mainFrame->seStatusText(TQString::null); + m_mainFrame->seStatusText(TQString()); } void View::slotFeedFetched(Feed *feed) @@ -1100,7 +1100,7 @@ void View::slotFeedFetched(Feed *feed) void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int) { - if (button == Qt::MidButton) + if (button == TQt::MidButton) { KURL link = article.link(); switch (Settings::mMBBehaviour()) @@ -1152,7 +1152,7 @@ void View::slotNewTag() void View::slotTagCreated(const Tag& tag) { - if (m_tagNodeList && !m_tagNodeList->tqcontainsTagId(tag.id())) + if (m_tagNodeList && !m_tagNodeList->containsTagId(tag.id())) { TagNode* tagNode = new TagNode(tag, m_feedList->rootNode()); m_tagNodeList->rootNode()->appendChild(tagNode); @@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article) if (delay > 0) m_markReadTimer->start( delay*1000, true ); else - a.seStatus(Article::Read); + a.setqStatus(Article::Read); } } @@ -1266,18 +1266,18 @@ void View::slotCopyLinkAddress() link = article.link().url(); else link = article.guid(); - QClipboard *cb = TQApplication::clipboard(); - cb->setText(link, QClipboard::Clipboard); - cb->setText(link, QClipboard::Selection); + TQClipboard *cb = TQApplication::clipboard(); + cb->setText(link, TQClipboard::Clipboard); + cb->setText(link, TQClipboard::Selection); } } -void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* parent) +void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* tqparent) { KURL::List::iterator it; for ( it = urls.begin(); it != urls.end(); ++it ) { - addFeed((*it).prettyURL(), after, parent, false); + addFeed((*it).prettyURL(), after, tqparent, false); } } @@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead() return; for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).seStatus(Article::Read); + (*it).setqStatus(Article::Read); } void View::slotTextToSpeechRequest() @@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread() return; for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).seStatus(Article::Unread); + (*it).setqStatus(Article::Unread); } void View::slotSetSelectedArticleNew() @@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew() return; for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).seStatus(Article::New); + (*it).setqStatus(Article::New); } void View::slotSetCurrentArticleReadDelayed() @@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed() if (article.isNull()) return; - article.seStatus(Article::Read); + article.setqStatus(Article::Read); } void View::slotMouseOverInfo(const KFileItem *kifi) @@ -1441,7 +1441,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi) } else { - m_mainFrame->seStatusText(TQString::null); + m_mainFrame->seStatusText(TQString()); } } @@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config) m_searchBar->slotSetText(config->readEntry("searchLine")); int statusfilter = config->readNumEntry("searchCombo", -1); if (statusfilter != -1) - m_searchBar->slotSeStatus(statusfilter); + m_searchBar->slotSetqStatus(statusfilter); } int selectedID = config->readNumEntry("selectedNodeID", -1); diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index 4b9dcd13b..66796d428 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _AKREGATORVIEW_H_ @@ -77,18 +77,19 @@ namespace Akregator { /** * This is the main widget of the view, containing tree view, article list, viewer etc. */ - class View : public QWidget + class View : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** constructor - @param part the Akregator::Part which tqcontains this widget - @param parent parent widget + @param part the Akregator::Part which contains this widget + @param tqparent tqparent widget @param Actionmanager for this view @param name the name of the widget (@ref TQWidget ) */ - View(Akregator::Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char* name); + View(Akregator::Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char* name); /** destructor. Note that cleanups should be done in slotOnShutdown(), so we don't risk accessing self-deleting objects after deletion. */ @@ -103,11 +104,11 @@ namespace Akregator { @param doc the DOM tree (OPML) of the feeds to import */ bool importFeeds(const TQDomDocument& doc); - /** Parse OPML presentation of feeds and read in articles archive, if present. If @c parent is @c NULL, the current - feed list is tqreplaced by the parsed one + /** Parse OPML presentation of feeds and read in articles archive, if present. If @c tqparent is @c NULL, the current + feed list is replaced by the parsed one @param doc TQDomDocument generated from OPML - @param parent The parent group the new nodes */ - bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0); + @param tqparent The tqparent group the new nodes */ + bool loadFeeds(const TQDomDocument& doc, Folder* tqparent = 0); /** @return the displayed Feed List in OPML format @@ -189,7 +190,7 @@ namespace Akregator { void slotCaptionChanged(const TQString &); /** called when URLs are dropped into the tree view */ - void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *parent); + void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *tqparent); /** displays a URL in the status bar when the user moves the mouse over a link */ void slotMouseOverInfo(const KFileItem *kifi); @@ -271,7 +272,7 @@ namespace Akregator { protected: - void addFeed(const TQString& url, TreeNode* after, Folder* parent, bool autoExec = true); + void addFeed(const TQString& url, TreeNode* after, Folder* tqparent, bool autoExec = true); void connectToFeedList(FeedList* feedList); void disconnectFromFeedList(FeedList* feedList); diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp index 09f631a0a..c0151af39 100644 --- a/akregator/src/article.cpp +++ b/akregator/src/article.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "article.h" @@ -55,7 +55,7 @@ struct Article::Private : public Shared 0001 0000 Keep */ - enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10}; + enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10}; TQString guid; Backend::FeedStorage* archive; @@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) if (article.meta("deleted") == "true") { // if article is in deleted state, we just add the status and omit the rest d->status = Private::Read | Private::Deleted; - d->archive->seStatus(d->guid, d->status); + d->archive->setqStatus(d->guid, d->status); } else { // article is not deleted, let's add it to the archive @@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) int statusInt = status.toInt(); if (statusInt == New) statusInt = Unread; - seStatus(statusInt); + setqStatus(statusInt); } setKeep(article.meta("keep") == "true"); } @@ -210,9 +210,9 @@ void Article::setDeleted() if (isDeleted()) return; - seStatus(Read); + setqStatus(Read); d->status = Private::Deleted | Private::Read; - d->archive->seStatus(d->guid, d->status); + d->archive->setqStatus(d->guid, d->status); d->archive->setDeleted(d->guid); if (d->feed) @@ -299,13 +299,13 @@ int Article::status() const return Unread; } -void Article::seStatus(int stat) +void Article::setqStatus(int stat) { // use status() rather than statusBits() here to filter out status flags that we are not // interested in - int oldStatus = status(); + int oldtqStatus = status(); - if (oldStatus != stat) + if (oldtqStatus != stat) { switch (stat) { @@ -319,9 +319,9 @@ void Article::seStatus(int stat) d->status = ( d->status | Private::New) & ~Private::Read; break; } - d->archive->seStatus(d->guid, d->status); + d->archive->setqStatus(d->guid, d->status); if (d->feed) - d->feed->setArticleChanged(*this, oldStatus); + d->feed->setArticleChanged(*this, oldtqStatus); } } @@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const void Article::setKeep(bool keep) { d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep); - d->archive->seStatus(d->guid, d->status); + d->archive->setqStatus(d->guid, d->status); if (d->feed) d->feed->setArticleChanged(*this); } @@ -453,11 +453,11 @@ TQString Article::buildTitle(const TQString& description) if (description.stripWhiteSpace().isEmpty()) return ""; - int i = s.find('>',500); /*avoid processing too much */ + int i = s.tqfind('>',500); /*avoid processing too much */ if (i != -1) s = s.left(i+1); TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false); - TQString tagName, toReplace, tqreplaceWith; + TQString tagName, toReplace, replaceWith; while (rx.search(s) != -1 ) { tagName=rx.cap(2); @@ -466,11 +466,11 @@ TQString Article::buildTitle(const TQString& description) else if (tagName.startsWith("br") || tagName.startsWith("BR")) { toReplace=rx.cap(1); - tqreplaceWith=" "; + replaceWith=" "; } else toReplace=rx.cap(1); // strip just tag - s=s.tqreplace(s.find(toReplace),toReplace.length(),tqreplaceWith); // do the deed + s=s.tqreplace(s.tqfind(toReplace),toReplace.length(),replaceWith); // do the deed } if (s.length()> 90) s=s.left(90)+"..."; diff --git a/akregator/src/article.h b/akregator/src/article.h index 4b4d480e6..8d1baa2a5 100644 --- a/akregator/src/article.h +++ b/akregator/src/article.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_ARTICLE_H @@ -57,7 +57,7 @@ namespace Akregator class Article { public: - enum Status { Unread=0, Read, New }; + enum tqStatus { Unread=0, Read, New }; typedef TQValueList<Article> List; Article(); @@ -80,7 +80,7 @@ namespace Akregator bool isNull() const; int status() const; - void seStatus(int s); + void setqStatus(int s); void offsetPubDate(int secs); diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index 065a421aa..e8e36f076 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT @@ -50,8 +50,8 @@ TQString Criterion::subjectToString(Subject subj) return TQString::tqfromLatin1("Author"); case Description: return TQString::tqfromLatin1("Description"); - case Status: - return TQString::tqfromLatin1("Status"); + case tqStatus: + return TQString::tqfromLatin1("tqStatus"); case KeepFlag: return TQString::tqfromLatin1("KeepFlag"); default: // should never happen (TM) @@ -69,8 +69,8 @@ Criterion::Subject Criterion::stringToSubject(const TQString& subjStr) return Description; else if (subjStr == TQString::tqfromLatin1("Author")) return Author; - else if (subjStr == TQString::tqfromLatin1("Status")) - return Status; + else if (subjStr == TQString::tqfromLatin1("tqStatus")) + return tqStatus; else if (subjStr == TQString::tqfromLatin1("KeepFlag")) return KeepFlag; @@ -163,7 +163,7 @@ bool Criterion::satisfiedBy( const Article &article ) const // ### Maybe use prettyURL here? concreteSubject = TQVariant(article.link().url()); break; - case Status: + case tqStatus: concreteSubject = TQVariant(article.status()); break; case KeepFlag: @@ -179,7 +179,7 @@ bool Criterion::satisfiedBy( const Article &article ) const switch ( predicateType ) { case Contains: - satisfied = concreteSubject.toString().find( m_object.toString(), 0, false ) != -1; + satisfied = concreteSubject.toString().tqfind( m_object.toString(), 0, false ) != -1; break; case Equals: if (subjectType=="int") @@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status) void SeStatusAction::exec(Article& article) { if (!article.isNull()) - article.seStatus(m_status); + article.setqStatus(m_status); } int SeStatusAction::status() const @@ -457,7 +457,7 @@ int SeStatusAction::status() const return m_status; } -void SeStatusAction::seStatus(int status) +void SeStatusAction::setqStatus(int status) { m_status = status; } diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h index dee27da55..c39d72e8a 100644 --- a/akregator/src/articlefilter.h +++ b/akregator/src/articlefilter.h @@ -18,7 +18,7 @@ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT @@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction virtual void exec(Article& article); int status() const; - void seStatus(int status); + void setqStatus(int status); virtual void writeConfig(KConfig* config) const; virtual void readConfig(KConfig* config); @@ -190,7 +190,7 @@ class AssignTagAction : public AbstractAction { public: - AssignTagAction(const TQString& tagID=TQString::null); + AssignTagAction(const TQString& tagID=TQString()); virtual void exec(Article& article); const TQString& tagID() const; @@ -259,7 +259,7 @@ class Criterion public: enum Subject { - Title, Description, Author, Link, Status, KeepFlag + Title, Description, Author, Link, tqStatus, KeepFlag }; static TQString subjectToString(Subject subj); diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index c9df89633..68e41730d 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "akregatorconfig.h" @@ -60,17 +60,17 @@ class ArticleListView::ArticleListViewPrivate { public: - ArticleListViewPrivate(ArticleListView* parent) : m_parent(parent) { } + ArticleListViewPrivate(ArticleListView* tqparent) : m_tqparent(tqparent) { } void ensureCurrentItemVisible() { - if (m_parent->currentItem()) + if (m_tqparent->currentItem()) { - m_parent->center( m_parent->contentsX(), m_parent->itemPos(m_parent->currentItem()), 0, 9.0 ); + m_tqparent->center( m_tqparent->contentsX(), m_tqparent->itemPos(m_tqparent->currentItem()), 0, 9.0 ); } } - ArticleListView* m_parent; + ArticleListView* m_tqparent; /** maps article to article item */ TQMap<Article, ArticleItem*> articleMap; @@ -131,7 +131,7 @@ class ArticleListView::ArticleItem : public KListViewItem friend class ArticleListView; public: - ArticleItem( TQListView *parent, const Article& a); + ArticleItem( TQListView *tqparent, const Article& a); ~ArticleItem(); Article& article(); @@ -155,8 +155,8 @@ class ArticleListView::ArticleItem : public KListViewItem }; // FIXME: Remove resolveEntities for KDE 4.0, it's now done in the parser -ArticleListView::ArticleItem::ArticleItem( TQListView *parent, const Article& a) - : KListViewItem( parent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t()) +ArticleListView::ArticleItem::ArticleItem( TQListView *tqparent, const Article& a) + : KListViewItem( tqparent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t()) { if (a.keep()) setPixmap(0, keepFlag()); @@ -182,9 +182,9 @@ void ArticleListView::ArticleItem::paintCell ( TQPainter * p, const TQColorGroup TQColorGroup cg2(cg); if (article().status() == Article::Unread) - cg2.setColor(TQColorGroup::Text, Qt::blue); + cg2.setColor(TQColorGroup::Text, TQt::blue); else // New - cg2.setColor(TQColorGroup::Text, Qt::red); + cg2.setColor(TQColorGroup::Text, TQt::red); KListViewItem::paintCell( p, cg2, column, width, align ); } @@ -213,8 +213,8 @@ int ArticleListView::ArticleItem::compare(TQListViewItem *i, int col, bool ascen /* ==================================================================================== */ -ArticleListView::ArticleListView(TQWidget *parent, const char *name) - : KListView(parent, name) +ArticleListView::ArticleListView(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { d = new ArticleListViewPrivate(this); d->noneSelected = true; @@ -577,7 +577,7 @@ void ArticleListView::viewportPaintEvent(TQPaintEvent *e) if(!e) return; - TQString message = TQString::null; + TQString message = TQString(); //kdDebug() << "visible articles: " << visibleArticles() << endl; diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h index d38f90267..5dbc08044 100644 --- a/akregator/src/articlelistview.h +++ b/akregator/src/articlelistview.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORARTICLELISTVIEW_H #define AKREGATORARTICLELISTVIEW_H @@ -43,8 +43,9 @@ namespace Akregator class ArticleListView : public KListView { Q_OBJECT + TQ_OBJECT public: - ArticleListView(TQWidget *parent = 0, const char *name = 0); + ArticleListView(TQWidget *tqparent = 0, const char *name = 0); virtual ~ArticleListView(); /** returns the current article, or a null article if there is none */ diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index d456a415d..608e2a8d9 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqdatetime.h> @@ -157,8 +157,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor ArticleViewer* m_view; }; -ArticleViewer::ArticleViewer(TQWidget *parent, const char *name) - : Viewer(parent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView) +ArticleViewer::ArticleViewer(TQWidget *tqparent, const char *name) + : Viewer(tqparent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView) { setJScriptEnabled(false); setJavaEnabled(false); @@ -169,8 +169,8 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name) generateNormalModeCSS(); generateCombinedModeCSS(); - new KAction( i18n("&Scroll Up"), TQString::null, "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" ); - new KAction( i18n("&Scroll Down"), TQString::null, "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" ); + new KAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" ); + new KAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" ); connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h index 0839c4461..7d756262a 100644 --- a/akregator/src/articleviewer.h +++ b/akregator/src/articleviewer.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ARTICLEVIEWER_H @@ -48,9 +48,10 @@ namespace Akregator class ArticleViewer : public Viewer { Q_OBJECT + TQ_OBJECT public: /** Constructor */ - ArticleViewer(TQWidget* parent, const char* name); + ArticleViewer(TQWidget* tqparent, const char* name); virtual ~ArticleViewer(); virtual bool openURL(const KURL &url); diff --git a/akregator/src/articleviewer.rc b/akregator/src/articleviewer.rc index 5b61457b2..a74bdf5cb 100644 --- a/akregator/src/articleviewer.rc +++ b/akregator/src/articleviewer.rc @@ -11,7 +11,7 @@ <Action name="viewer_copy"/> <Action name="selectAll"/> <Separator/> - <Action name="find"/> + <Action name="tqfind"/> <Action name="findNext"/> </Menu> <Menu noMerge="1" name="view"> diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp index 52e26548a..76fd06c5d 100644 --- a/akregator/src/configdialog.cpp +++ b/akregator/src/configdialog.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqstringlist.h> @@ -41,7 +41,7 @@ namespace Akregator { -ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal) +ConfigDialog::ConfigDialog(TQWidget* tqparent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(tqparent, name, config, dialogType, dialogButtons, defaultButton, modal) { addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings"); addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings"); diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h index 78136e324..670742a99 100644 --- a/akregator/src/configdialog.h +++ b/akregator/src/configdialog.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_CONFIGDIALOG_H @@ -35,9 +35,10 @@ class SettingsAppearance; class ConfigDialog : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: - ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false); + ConfigDialog(TQWidget *tqparent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false); virtual ~ConfigDialog(); diff --git a/akregator/src/dragobjects.cpp b/akregator/src/dragobjects.cpp index 020748911..5f48d5be2 100644 --- a/akregator/src/dragobjects.cpp +++ b/akregator/src/dragobjects.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "dragobjects.h" diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h index 88531d367..5a232c097 100644 --- a/akregator/src/dragobjects.h +++ b/akregator/src/dragobjects.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_DRAGOBJECTS_H diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index edf1a7909..8e0c4c90c 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqtimer.h> @@ -365,7 +365,7 @@ bool Feed::fetchErrorOccurred() { return d->fetchError; } bool Feed::isArticlesLoaded() const { return d->articlesLoaded; } -TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const +TQDomElement Feed::toOPML( TQDomElement tqparent, TQDomDocument document ) const { TQDomElement el = document.createElement( "outline" ); el.setAttribute( "text", title() ); @@ -388,7 +388,7 @@ TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const el.setAttribute( "maxArticleNumber", d->maxArticleNumber ); el.setAttribute( "type", "rss" ); // despite some additional fields, its still "rss" OPML el.setAttribute( "version", "RSS" ); - parent.appendChild( el ); + tqparent.appendChild( el ); return el; } @@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead() TQValueList<Article>::Iterator en = tarticles.end(); for (it = tarticles.begin(); it != en; ++it) - (*it).seStatus(Article::Read); + (*it).setqStatus(Article::Read); setNotificationMode(true, true); } } @@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc) d->addedArticlesNotify.append(mya); if (!mya.isDeleted() && !markImmediatelyAsRead()) - mya.seStatus(Article::New); + mya.setqStatus(Article::New); else - mya.seStatus(Article::Read); + mya.setqStatus(Article::Read); changed = true; } @@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc) { mya.setKeep(old.keep()); int oldstatus = old.status(); - old.seStatus(Article::Read); + old.setqStatus(Article::Read); d->articles.remove(old.guid()); appendArticle(mya); - mya.seStatus(oldstatus); + mya.setqStatus(oldstatus); d->updatedArticlesNotify.append(mya); changed = true; @@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery) { if ((*it).status() == Article::New) { - (*it).seStatus(Article::Unread); + (*it).setqStatus(Article::Unread); } } @@ -579,7 +579,7 @@ void Feed::tryFetch() { d->fetchError = false; - d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) ); + d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, tqStatus)) ); //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long))); d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever ); } @@ -595,7 +595,7 @@ void Feed::slotImageFetched(const TQPixmap& image) nodeModified(); } -void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status) +void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus status) { // Note that loader instances delete themselves d->loader = 0; @@ -735,14 +735,14 @@ void Feed::setArticleDeleted(Article& a) articlesModified(); } -void Feed::setArticleChanged(Article& a, int oldStatus) +void Feed::setArticleChanged(Article& a, int oldtqStatus) { - if (oldStatus != -1) + if (oldtqStatus != -1) { - int newStatus = a.status(); - if (oldStatus == Article::Read && newStatus != Article::Read) + int newtqStatus = a.status(); + if (oldtqStatus == Article::Read && newtqStatus != Article::Read) setUnread(unread()+1); - else if (oldStatus != Article::Read && newStatus == Article::Read) + else if (oldtqStatus != Article::Read && newtqStatus == Article::Read) setUnread(unread()-1); } d->updatedArticlesNotify.append(a); @@ -759,13 +759,13 @@ TreeNode* Feed::next() if ( nextSibling() ) return nextSibling(); - Folder* p = parent(); + Folder* p = tqparent(); while (p) { if ( p->nextSibling() ) return p->nextSibling(); else - p = p->parent(); + p = p->tqparent(); } return 0; } diff --git a/akregator/src/feed.h b/akregator/src/feed.h index d94eecaca..c9590365b 100644 --- a/akregator/src/feed.h +++ b/akregator/src/feed.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORFEED_H @@ -43,7 +43,7 @@ namespace KPIM { // needed for slot fetchCompleted() using RSS::Document; using RSS::Loader; -using RSS::Status; +using RSS::tqStatus; namespace Akregator { @@ -64,6 +64,7 @@ namespace Akregator friend class Article; Q_OBJECT + TQ_OBJECT public: /** the archiving modes: - globalDefault: use default from Settings (default) @@ -94,7 +95,7 @@ namespace Akregator virtual bool accept(TreeNodeVisitor* visitor); /** exports the feed settings to OPML */ - virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const; /** returns whether this feed uses its own fetch interval or the global setting @@ -177,7 +178,7 @@ namespace Akregator /** sets the description of this feed */ void setDescription(const TQString& s); - virtual TQValueList<Article> articles(const TQString& tag=TQString::null); + virtual TQValueList<Article> articles(const TQString& tag=TQString()); /** returns the article with the given @c guid, or a null article if it not exists */ virtual Article findArticle(const TQString& guid) const; @@ -253,7 +254,7 @@ namespace Akregator private slots: - void fetchCompleted(Loader *loader, Document doc, Status status); + void fetchCompleted(Loader *loader, Document doc, tqStatus status); void slotImageFetched(const TQPixmap& image); private: @@ -264,10 +265,10 @@ namespace Akregator void setArticleDeleted(Article& a); /** notifies that article @c mya was changed - @param oldStatus if the status was changed, it tqcontains the old status, -1 otherwise + @param oldtqStatus if the status was changed, it contains the old status, -1 otherwise To be called by @ref Article */ - void setArticleChanged(Article& a, int oldStatus=-1); + void setArticleChanged(Article& a, int oldtqStatus=-1); void enforceLimitArticleNumber(); diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp index 884337067..adc3fce42 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "feed.h" @@ -69,8 +69,8 @@ void FeedIconManager::fetchIcon(Feed* feed) loadIcon(iconURL); } -FeedIconManager::FeedIconManager(TQObject * parent, const char *name) -: TQObject(parent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate) +FeedIconManager::FeedIconManager(TQObject * tqparent, const char *name) +: TQObject(tqparent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate) { connectDCOPSignal("kded", "favicons", "iconChanged(bool, TQString, TQString)", @@ -119,14 +119,14 @@ TQString FeedIconManager::iconLocation(const KURL & url) const kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply); - if (replyType == "TQString") { + if (replyType == TQSTRING_OBJECT_NAME_STRING) { TQDataStream replyStream(reply, IO_ReadOnly); TQString result; replyStream >> result; return result; } - return TQString::null; + return TQString(); } void FeedIconManager::slotFeedDestroyed(TreeNode* node) @@ -134,7 +134,7 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node) Feed* feed = dynamic_cast<Feed*>(node); if (feed) while (d->registeredFeeds.tqcontains(feed)) - d->registeredFeeds.remove(d->registeredFeeds.find(feed)); + d->registeredFeeds.remove(d->registeredFeeds.tqfind(feed)); } void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL, diff --git a/akregator/src/feediconmanager.h b/akregator/src/feediconmanager.h index af4d5828a..b7bee57fe 100644 --- a/akregator/src/feediconmanager.h +++ b/akregator/src/feediconmanager.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef FEEDICONMGR_H @@ -45,6 +45,7 @@ namespace Akregator class FeedIconManager:public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: diff --git a/akregator/src/feeditem.cpp b/akregator/src/feeditem.cpp index cb00e5c0f..8cdafeada 100644 --- a/akregator/src/feeditem.cpp +++ b/akregator/src/feeditem.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "actionmanager.h" @@ -34,23 +34,23 @@ namespace Akregator { -FeedItem::FeedItem(FolderItem* parent, Feed* node) : TreeNodeItem(parent, node) +FeedItem::FeedItem(FolderItem* tqparent, Feed* node) : TreeNodeItem(tqparent, node) { initialize(node); } -FeedItem::FeedItem(KListView* parent, Feed* node) : TreeNodeItem(parent, node) +FeedItem::FeedItem(KListView* tqparent, Feed* node) : TreeNodeItem(tqparent, node) { initialize(node); } -FeedItem::FeedItem(KListView* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node) +FeedItem::FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node) { initialize(node); } -FeedItem::FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node) +FeedItem::FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node) { initialize(node); } diff --git a/akregator/src/feeditem.h b/akregator/src/feeditem.h index cc3c7efb2..4f716a62b 100644 --- a/akregator/src/feeditem.h +++ b/akregator/src/feeditem.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORFEEDITEM_H @@ -40,10 +40,10 @@ class FeedItem : public TreeNodeItem { public: - FeedItem(FolderItem* parent, Feed* node); - FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node); - FeedItem(KListView* parent, Feed* node); - FeedItem(KListView* parent, TreeNodeItem* after, Feed* node); + FeedItem(FolderItem* tqparent, Feed* node); + FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node); + FeedItem(KListView* tqparent, Feed* node); + FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node); virtual ~FeedItem(); virtual Feed* node(); diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp index 1195b5ddd..50496d8bc 100644 --- a/akregator/src/feedlist.cpp +++ b/akregator/src/feedlist.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "feedlist.h" @@ -80,8 +80,8 @@ class FeedList::RemoveNodeVisitor : public TreeNodeVisitor FeedList* m_list; }; -FeedList::FeedList(TQObject *parent, const char *name) - : NodeList(parent, name), d(new FeedListPrivate) +FeedList::FeedList(TQObject *tqparent, const char *name) + : NodeList(tqparent, name), d(new FeedListPrivate) { d->addNodeVisitor = new AddNodeVisitor(this); d->removeNodeVisitor = new RemoveNodeVisitor(this); @@ -104,7 +104,7 @@ void FeedList::removeNode(TreeNode* node) d->removeNodeVisitor->visit(node); } -void FeedList::parseChildNodes(TQDomNode &node, Folder* parent) +void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent) { TQDomElement e = node.toElement(); // try to convert the node to an element. @@ -119,13 +119,13 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* parent) { if (!d->urlMap[feed->xmlUrl()].tqcontains(feed)) d->urlMap[feed->xmlUrl()].append(feed); - parent->appendChild(feed); + tqparent->appendChild(feed); } } else { Folder* fg = Folder::fromOPML(e); - parent->appendChild(fg); + tqparent->appendChild(fg); if (e.hasChildNodes()) { @@ -214,21 +214,21 @@ Article FeedList::findArticle(const TQString& feedURL, const TQString& guid) con return feed ? feed->findArticle(guid) : Article(); } -void FeedList::append(FeedList* list, Folder* parent, TreeNode* after) +void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after) { if ( list == this ) return; - if ( !flatList()->tqcontains(parent) ) - parent = rootNode(); + if ( !flatList()->tqcontains(tqparent) ) + tqparent = rootNode(); - TQValueList<TreeNode*> children = list->rootNode()->children(); + TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren(); - TQValueList<TreeNode*>::ConstIterator end( children.end() ); - for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) + TQValueList<TreeNode*>::ConstIterator end( tqchildren.end() ); + for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it) { list->rootNode()->removeChild(*it); - parent->insertChild(*it, after); + tqparent->insertChild(*it, after); after = *it; } } @@ -254,11 +254,11 @@ TQDomDocument FeedList::toXML() const TQDomElement body = doc.createElement( "body" ); root.appendChild( body ); - TQValueList<TreeNode*> children = rootNode()->children(); + TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren(); - TQValueList<TreeNode*>::ConstIterator end( children.end() ); + TQValueList<TreeNode*>::ConstIterator end( tqchildren.end() ); - for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) + for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it) body.appendChild( (*it)->toOPML(body, doc) ); return doc; diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h index c0ba14ccd..4e630ea7c 100644 --- a/akregator/src/feedlist.h +++ b/akregator/src/feedlist.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORFEEDLIST_H @@ -44,16 +44,17 @@ class TreeNode; class FeedList : public NodeList { Q_OBJECT + TQ_OBJECT public: - FeedList(TQObject *parent = 0, const char *name = 0); + FeedList(TQObject *tqparent = 0, const char *name = 0); /** Destructor. Contained nodes are deleted! */ ~FeedList(); /** appends another feed list as sub tree. The root node of @c list is ignored. NOTE: nodes are _moved_ from @c list to this feed list, not copied */ - void append(FeedList* list, Folder* parent=0, TreeNode* after=0); + void append(FeedList* list, Folder* tqparent=0, TreeNode* after=0); /** reads an OPML document and appends the items to this list @param doc the OPML document to parse @@ -64,7 +65,7 @@ public: /** exports the feed list as OPML. The root node ("All Feeds") is ignored! */ virtual TQDomDocument toXML() const; - /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it tqcontains the same feed multiple times, any of the Feed objects is returned. */ + /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it contains the same feed multiple times, any of the Feed objects is returned. */ Feed* findByURL(const TQString& feedURL) const; Article findArticle(const TQString& feedURL, const TQString& guid) const; @@ -81,7 +82,7 @@ protected: public: // compat with KDE-3.x assertions, remove for KDE 4 // private: - void parseChildNodes(TQDomNode &node, Folder* parent); + void parseChildNodes(TQDomNode &node, Folder* tqparent); // never call these FeedList(const FeedList&) : NodeList() {} diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index b680c7c58..0ca068fdd 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "dragobjects.h" @@ -65,7 +65,7 @@ class NodeListView::NodeListViewPrivate bool showTagFolders; // Drag and Drop variables - TQListViewItem *parent; + TQListViewItem *tqparent; TQListViewItem *afterme; TQTimer autoopentimer; ConnectNodeVisitor* connectNodeVisitor; @@ -179,9 +179,9 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { - // delete child items recursively before deleting parent - TQValueList<TreeNode*> children = node->children(); - for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) + // delete child items recursively before deleting tqparent + TQValueList<TreeNode*> tqchildren = node->tqchildren(); + for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) visit(*it); visitTreeNode(node); @@ -212,15 +212,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor TagNodeItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent())); - if (parentItem) + FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); + if (tqparentItem) { if (prev) { - item = new TagNodeItem( parentItem, m_view->findNodeItem(prev), node); + item = new TagNodeItem( tqparentItem, m_view->findNodeItem(prev), node); } else - item = new TagNodeItem( parentItem, node); + item = new TagNodeItem( tqparentItem, node); } else { @@ -234,8 +234,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor item->nodeChanged(); m_view->d->itemDict.insert(node, item); m_view->connectToNode(node); - if (parentItem) - parentItem->sortChildItems(0, true); + if (tqparentItem) + tqparentItem->sortChildItems(0, true); return true; } @@ -246,15 +246,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor TagFolderItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent())); - if (parentItem) + FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); + if (tqparentItem) { if (prev) { - item = new TagFolderItem( parentItem, m_view->findNodeItem(prev), node); + item = new TagFolderItem( tqparentItem, m_view->findNodeItem(prev), node); } else - item = new TagFolderItem(parentItem, node); + item = new TagFolderItem(tqparentItem, node); } else { @@ -267,10 +267,10 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor } m_view->d->itemDict.insert(node, item); - TQValueList<TreeNode*> children = node->children(); + TQValueList<TreeNode*> tqchildren = node->tqchildren(); - // add children recursively - for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) + // add tqchildren recursively + for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) visit(*it); m_view->connectToNode(node); @@ -284,15 +284,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor FolderItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent())); - if (parentItem) + FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); + if (tqparentItem) { if (prev) { - item = new FolderItem( parentItem, m_view->findNodeItem(prev), node); + item = new FolderItem( tqparentItem, m_view->findNodeItem(prev), node); } else - item = new FolderItem(parentItem, node); + item = new FolderItem(tqparentItem, node); } else { @@ -305,9 +305,9 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor } m_view->d->itemDict.insert(node, item); - // add children recursively - TQValueList<TreeNode*> children = node->children(); - for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) + // add tqchildren recursively + TQValueList<TreeNode*> tqchildren = node->tqchildren(); + for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) visit(*it); m_view->connectToNode(node); @@ -321,16 +321,16 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor FeedItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent())); + FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); - if (parentItem) + if (tqparentItem) { if (prev) { - item = new FeedItem( parentItem, m_view->findNodeItem(prev), node); + item = new FeedItem( tqparentItem, m_view->findNodeItem(prev), node); } else - item = new FeedItem( parentItem, node); + item = new FeedItem( tqparentItem, node); } else { @@ -352,8 +352,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor NodeListView* m_view; }; -NodeListView::NodeListView( TQWidget *parent, const char *name) - : KListView(parent, name), d(new NodeListViewPrivate) +NodeListView::NodeListView( TQWidget *tqparent, const char *name) + : KListView(tqparent, name), d(new NodeListViewPrivate) { d->showTagFolders = true; d->connectNodeVisitor = new ConnectNodeVisitor(this), @@ -457,7 +457,7 @@ TreeNode* NodeListView::findNodeByTitle(const TQString& title) TreeNodeItem* NodeListView::findNodeItem(TreeNode* node) { - return d->itemDict.find(node); + return d->itemDict.tqfind(node); } TreeNodeItem* NodeListView::findItemByTitle(const TQString& text, int column, ComparisonFlags compare) const @@ -510,7 +510,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem* if (KURLDrag::canDecode(e)) { - FolderItem* parent = dynamic_cast<FolderItem*> (d->parent); + FolderItem* tqparent = dynamic_cast<FolderItem*> (d->tqparent); TreeNodeItem* afterMe = 0; if(d->afterme) @@ -519,7 +519,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem* KURL::List urls; KURLDrag::decode( e, urls ); e->accept(); - emit signalDropped( urls, afterMe ? afterMe->node() : 0, parent ? parent->node() : 0); + emit signalDropped( urls, afterMe ? afterMe->node() : 0, tqparent ? tqparent->node() : 0); } } else @@ -527,23 +527,23 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem* } } -void NodeListView::movableDropEvent(TQListViewItem* /*parent*/, TQListViewItem* /*afterme*/) +void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem* /*afterme*/) { d->autoopentimer.stop(); - if (d->parent) + if (d->tqparent) { openFolder(); - Folder* parentNode = (dynamic_cast<FolderItem*> (d->parent))->node(); + Folder* tqparentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node(); TreeNode* afterMeNode = 0; TreeNode* current = selectedNode(); if (d->afterme) afterMeNode = (dynamic_cast<TreeNodeItem*> (d->afterme))->node(); - current->parent()->removeChild(current); - parentNode->insertChild(current, afterMeNode); - KListView::movableDropEvent(d->parent, d->afterme); + current->tqparent()->removeChild(current); + tqparentNode->insertChild(current, afterMeNode); + KListView::movableDropEvent(d->tqparent, d->afterme); } } @@ -557,13 +557,13 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) TQPoint vp = contentsToViewport(event->pos()); TQListViewItem *i = itemAt(vp); - TQListViewItem *qiparent; + TQListViewItem *qitqparent; TQListViewItem *qiafterme; - findDrop( event->pos(), qiparent, qiafterme ); + findDrop( event->pos(), qitqparent, qiafterme ); if (event->source() == viewport()) { // disable any drops where the result would be top level nodes - if (i && !i->parent()) + if (i && !i->tqparent()) { event->ignore(); d->autoopentimer.stop(); @@ -572,12 +572,12 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) // prevent dragging nodes from All Feeds to My Tags or vice versa TQListViewItem* root1 = i; - while (root1 && root1->parent()) - root1 = root1->parent(); + while (root1 && root1->tqparent()) + root1 = root1->tqparent(); TQListViewItem* root2 = selectedItem(); - while (root2 && root2->parent()) - root2 = root2->parent(); + while (root2 && root2->tqparent()) + root2 = root2->tqparent(); if (root1 != root2) { @@ -587,7 +587,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) } // don't drop node into own subtree - TQListViewItem* p = qiparent; + TQListViewItem* p = qitqparent; while (p) if (p == selectedItem()) { @@ -597,7 +597,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) } else { - p = p->parent(); + p = p->tqparent(); } // disable drags onto the item itself @@ -615,7 +615,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) // event->pos().x() < header()->cellPos(header()->mapToIndex(0))) // {} else - // do we want to move inside the old parent or do we want to move to a new parent + // do we want to move inside the old tqparent or do we want to move to a new tqparent if (i && (itemAt(vp - TQPoint(0,5)) == i && itemAt(vp + TQPoint(0,5)) == i)) { setDropVisualizer(false); @@ -625,10 +625,10 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) TreeNode *iNode = (dynamic_cast<TreeNodeItem*> (i))->node(); if (iNode->isGroup()) { - if (i != d->parent) + if (i != d->tqparent) d->autoopentimer.start(750); - d->parent = i; + d->tqparent = i; d->afterme = 0; } else @@ -644,7 +644,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) setDropVisualizer(true); setDropHighlighter(false); cleanItemHighlighter(); - d->parent = qiparent; + d->tqparent = qitqparent; d->afterme = qiafterme; d->autoopentimer.stop(); } @@ -665,7 +665,7 @@ bool NodeListView::acceptDrag(TQDropEvent *e) const else { // disable dragging of top-level nodes (All Feeds, My Tags) - if (selectedItem() && !selectedItem()->parent()) + if (selectedItem() && !selectedItem()->tqparent()) return false; else return true; @@ -719,8 +719,8 @@ void NodeListView::slotItemLeft() sel->setOpen(false); else { - if (sel->parent()) - setSelected( sel->parent(), true ); + if (sel->tqparent()) + setSelected( sel->tqparent(), true ); } ensureItemVisible( selectedItem() ); @@ -927,7 +927,7 @@ void NodeListView::slotNodeAdded(TreeNode* node) d->createItemVisitor->visit(node); } -void NodeListView::slotNodeRemoved(Folder* /*parent*/, TreeNode* node) +void NodeListView::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node) { if (node) d->deleteItemVisitor->deleteItem(node, false); @@ -1012,9 +1012,9 @@ TQDragObject *NodeListView::dragObject() void NodeListView::openFolder() { d->autoopentimer.stop(); - if (d->parent && !d->parent->isOpen()) + if (d->tqparent && !d->tqparent->isOpen()) { - d->parent->setOpen(true); + d->tqparent->setOpen(true); } } diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h index efa84392f..1a5111f4d 100644 --- a/akregator/src/feedlistview.h +++ b/akregator/src/feedlistview.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORFEEDLISTVIEW_H #define AKREGATORFEEDLISTVIEW_H @@ -39,8 +39,9 @@ class TagNodeList; class NodeListView : public KListView { Q_OBJECT + TQ_OBJECT public: - NodeListView( TQWidget *parent = 0, const char *name = 0 ); + NodeListView( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~NodeListView(); /** sets the feed list to show. Disconnects from the old feed list, if there is any. */ @@ -91,7 +92,7 @@ public slots: void slotItemBegin(); /** select last item in the list */ void slotItemEnd(); - /** go to parent item */ + /** go to tqparent item */ void slotItemLeft(); /** go to first child */ void slotItemRight(); @@ -132,7 +133,7 @@ public: // compat with KDE-3.x assertions, remove for KDE 4 int cx, int cy, int cw, int ch ); virtual void contentsDragMoveEvent(TQDragMoveEvent* event); virtual bool acceptDrag(TQDropEvent *event) const; - virtual void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme); + virtual void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme); virtual TQDragObject *dragObject(); @@ -154,10 +155,10 @@ protected slots: /** called when a node is added to the tree. If no item for the node exists, it will be created */ virtual void slotNodeAdded(TreeNode* node); - /** Called when a node in the tree is taken out of the tree (parent->removeChild()) + /** Called when a node in the tree is taken out of the tree (tqparent->removeChild()) - Removes a node and its children from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */ - virtual void slotNodeRemoved(Folder* parent, TreeNode* node); + Removes a node and its tqchildren from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */ + virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node); /** deletes the item belonging to the deleted node */ virtual void slotNodeDestroyed(TreeNode* node); @@ -192,8 +193,9 @@ public: // compat with KDE-3.x assertions, remove for KDE 4 class TagNodeListView : public NodeListView { Q_OBJECT + TQ_OBJECT public: - TagNodeListView(TQWidget *parent = 0, const char *name = 0) {} + TagNodeListView(TQWidget *tqparent = 0, const char *name = 0) {} virtual ~TagNodeListView() {} private: diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h index bbf362078..c0685695a 100644 --- a/akregator/src/feedstorage.h +++ b/akregator/src/feedstorage.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_BACKEND_FEEDSTORAGE_H #define AKREGATOR_BACKEND_FEEDSTORAGE_H @@ -55,7 +55,7 @@ class AKREGATOR_EXPORT Category { return !operator==(other); } - /** we need this for QMaps */ + /** we need this for TQMaps */ bool operator<(const Category& other) const { return other.scheme < other.scheme || (other.scheme == other.scheme && term < other.term); @@ -64,7 +64,7 @@ class AKREGATOR_EXPORT Category class Storage; -class AKREGATOR_EXPORT FeedStorage : public QObject +class AKREGATOR_EXPORT FeedStorage : public TQObject { public: @@ -75,12 +75,12 @@ class AKREGATOR_EXPORT FeedStorage : public QObject virtual void setLastFetch(int lastFetch) = 0; /** returns the guids of all articles in this storage. If a tagID is given, only articles with this tag are returned */ - virtual TQStringList articles(const TQString& tagID=TQString::null) = 0; + virtual TQStringList articles(const TQString& tagID=TQString()) = 0; /** returns the guid of the articles in a given category */ virtual TQStringList articles(const Category& cat) = 0; - /** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is tqreplaced by the article from the source + /** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is replaced by the article from the source @param source the archive which articles should be appended */ virtual void add(FeedStorage* source) = 0; @@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject virtual uint pubDate(const TQString& guid) = 0; virtual void setPubDate(const TQString& guid, uint pubdate) = 0; virtual int status(const TQString& guid) = 0; - virtual void seStatus(const TQString& guid, int status) = 0; + virtual void setqStatus(const TQString& guid, int status) = 0; virtual TQString title(const TQString& guid) = 0; virtual void setTitle(const TQString& guid, const TQString& title) = 0; virtual TQString description(const TQString& guid) = 0; @@ -121,10 +121,10 @@ class AKREGATOR_EXPORT FeedStorage : public QObject virtual void removeTag(const TQString& guid, const TQString& tag) = 0; /** returns the tags of a given article. If @c guid is null, it returns all tags used in this feed */ - virtual TQStringList tags(const TQString& guid=TQString::null) = 0; + virtual TQStringList tags(const TQString& guid=TQString()) = 0; virtual void addCategory(const TQString& guid, const Category& category) = 0; - virtual TQValueList<Category> categories(const TQString& guid=TQString::null) = 0; + virtual TQValueList<Category> categories(const TQString& guid=TQString()) = 0; virtual void setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length) = 0; virtual void removeEnclosure(const TQString& guid) = 0; diff --git a/akregator/src/feedstoragedummyimpl.cpp b/akregator/src/feedstoragedummyimpl.cpp index b7200b0e0..9d7b8e125 100644 --- a/akregator/src/feedstoragedummyimpl.cpp +++ b/akregator/src/feedstoragedummyimpl.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "feedstoragedummyimpl.h" @@ -246,7 +246,7 @@ int FeedStorageDummyImpl::status(const TQString& guid) return tqcontains(guid) ? d->entries[guid].status : 0; } -void FeedStorageDummyImpl::seStatus(const TQString& guid, int status) +void FeedStorageDummyImpl::setqStatus(const TQString& guid, int status) { if (tqcontains(guid)) d->entries[guid].status = status; @@ -407,7 +407,7 @@ void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source setHash(guid, source->hash(guid)); setLink(guid, source->link(guid)); setPubDate(guid, source->pubDate(guid)); - seStatus(guid, source->status(guid)); + setqStatus(guid, source->status(guid)); setTitle(guid, source->title(guid)); TQStringList tags = source->tags(guid); @@ -440,8 +440,8 @@ void FeedStorageDummyImpl::removeEnclosure(const TQString& guid) { FeedStorageDummyImplPrivate::Entry entry = d->entries[guid]; entry.hasEnclosure = false; - entry.enclosureUrl = TQString::null; - entry.enclosureType = TQString::null; + entry.enclosureUrl = TQString(); + entry.enclosureType = TQString(); entry.enclosureLength = -1; } } @@ -459,8 +459,8 @@ void FeedStorageDummyImpl::enclosure(const TQString& guid, bool& hasEnclosure, T else { hasEnclosure = false; - url = TQString::null; - type = TQString::null; + url = TQString(); + type = TQString(); length = -1; } } diff --git a/akregator/src/feedstoragedummyimpl.h b/akregator/src/feedstoragedummyimpl.h index d15f45bd7..4ba4a4606 100644 --- a/akregator/src/feedstoragedummyimpl.h +++ b/akregator/src/feedstoragedummyimpl.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_BACKEND_FEEDSTORAGEDUMMYIMPL_H #define AKREGATOR_BACKEND_FEEDSTORAGEDUMMYIMPL_H @@ -45,7 +45,7 @@ class FeedStorageDummyImpl : public FeedStorage virtual int lastFetch(); virtual void setLastFetch(int lastFetch); - virtual TQStringList articles(const TQString& tag=TQString::null); + virtual TQStringList articles(const TQString& tag=TQString()); virtual TQStringList articles(const Category& cat); @@ -69,21 +69,21 @@ class FeedStorageDummyImpl : public FeedStorage virtual uint pubDate(const TQString& guid); virtual void setPubDate(const TQString& guid, uint pubdate); virtual int status(const TQString& guid); - virtual void seStatus(const TQString& guid, int status); + virtual void setqStatus(const TQString& guid, int status); virtual TQString title(const TQString& guid); virtual void setTitle(const TQString& guid, const TQString& title); virtual TQString description(const TQString& guid); virtual void setDescription(const TQString& guid, const TQString& description); virtual void addTag(const TQString& guid, const TQString& tag); virtual void removeTag(const TQString& guid, const TQString& tag); - virtual TQStringList tags(const TQString& guid=TQString::null); + virtual TQStringList tags(const TQString& guid=TQString()); virtual void setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length); virtual void removeEnclosure(const TQString& guid); virtual void enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length); virtual void addCategory(const TQString& guid, const Category& category); - virtual TQValueList<Category> categories(const TQString& guid=TQString::null); + virtual TQValueList<Category> categories(const TQString& guid=TQString()); virtual void setAuthor(const TQString& guid, const TQString& author); virtual TQString author(const TQString& guid); diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp index 6093cb51c..d171d25ed 100644 --- a/akregator/src/fetchqueue.cpp +++ b/akregator/src/fetchqueue.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqvaluelist.h> @@ -42,7 +42,7 @@ class FetchQueue::FetchQueuePrivate }; -FetchQueue::FetchQueue(TQObject* parent, const char* name): TQObject(parent, name), d(new FetchQueuePrivate) {} +FetchQueue::FetchQueue(TQObject* tqparent, const char* name): TQObject(tqparent, name), d(new FetchQueuePrivate) {} FetchQueue::~FetchQueue() diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h index 873fde6fa..9e92bb162 100644 --- a/akregator/src/fetchqueue.h +++ b/akregator/src/fetchqueue.h @@ -19,12 +19,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ -#ifndef AKREGATOR_FETCHQUEUE_H -#define AKREGATOR_FETCHQUEUE_H +#ifndef AKREGATOR_FETCHTQUEUE_H +#define AKREGATOR_FETCHTQUEUE_H #include <tqobject.h> @@ -33,13 +33,14 @@ namespace Akregator { class Feed; class TreeNode; -class FetchQueue : public QObject +class FetchQueue : public TQObject { Q_OBJECT + TQ_OBJECT public: - FetchQueue(TQObject* parent=0, const char* name=0); + FetchQueue(TQObject* tqparent=0, const char* name=0); virtual ~FetchQueue(); /** returns true when no feeds are neither fetching nor queued */ diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp index fac9bd2e7..78612ec79 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "article.h" #include "folder.h" @@ -39,9 +39,9 @@ namespace Akregator { class Folder::FolderPrivate { public: - /** List of children */ - TQValueList<TreeNode*> children; - /** caching unread count of children */ + /** List of tqchildren */ + TQValueList<TreeNode*> tqchildren; + /** caching unread count of tqchildren */ int unread; /** whether or not the folder is expanded */ bool open; @@ -77,7 +77,7 @@ Folder::Folder(const TQString& title) : TreeNode(), d(new FolderPrivate) Folder::~Folder() { TreeNode* tmp = 0; - for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != d->children.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != d->tqchildren.end(); ++it) { delete tmp; tmp = *it; @@ -93,10 +93,10 @@ Folder::~Folder() TQStringList Folder::tags() const { TQStringList t; - TQValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) { - // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want QSet. Now. + // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want TQSet. Now. TQStringList t2 = (*it)->tags(); for (TQStringList::ConstIterator it2 = t2.begin(); it2 != t2.end(); ++it2) if (!t.tqcontains(*it2)) @@ -108,36 +108,36 @@ TQStringList Folder::tags() const TQValueList<Article> Folder::articles(const TQString& tag) { TQValueList<Article> seq; - TQValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) seq += (*it)->articles(tag); return seq; } -TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const +TQDomElement Folder::toOPML( TQDomElement tqparent, TQDomDocument document ) const { TQDomElement el = document.createElement( "outline" ); el.setAttribute( "text", title() ); - parent.appendChild( el ); + tqparent.appendChild( el ); el.setAttribute("isOpen", d->open ? "true" : "false"); el.setAttribute( "id", TQString::number(id()) ); - TQValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) el.appendChild( (*it)->toOPML(el, document) ); return el; } -TQValueList<TreeNode*> Folder::children() const +TQValueList<TreeNode*> Folder::tqchildren() const { - return d->children; + return d->tqchildren; } void Folder::insertChild(TreeNode* node, TreeNode* after) { - int pos = d->children.findIndex(after); + int pos = d->tqchildren.findIndex(after); if (pos < 0) prependChild(node); @@ -150,10 +150,10 @@ void Folder::insertChild(uint index, TreeNode* node) // kdDebug() << "enter Folder::insertChild(int, node) " << node->title() << endl; if (node) { - if (index >= d->children.size()) - d->children.append(node); + if (index >= d->tqchildren.size()) + d->tqchildren.append(node); else - d->children.insert(d->children.at(index), node); + d->tqchildren.insert(d->tqchildren.at(index), node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -170,7 +170,7 @@ void Folder::appendChild(TreeNode* node) // kdDebug() << "enter Folder::appendChild() " << node->title() << endl; if (node) { - d->children.append(node); + d->tqchildren.append(node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -187,7 +187,7 @@ void Folder::prependChild(TreeNode* node) // kdDebug() << "enter Folder::prependChild() " << node->title() << endl; if (node) { - d->children.prepend(node); + d->tqchildren.prepend(node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -202,10 +202,10 @@ void Folder::prependChild(TreeNode* node) void Folder::removeChild(TreeNode* node) { // kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl; - if (node && d->children.tqcontains(node)) + if (node && d->tqchildren.tqcontains(node)) { node->setParent(0); - d->children.remove(node); + d->tqchildren.remove(node); disconnectFromNode(node); updateUnreadCount(); emit signalChildRemoved(this, node); @@ -219,12 +219,12 @@ void Folder::removeChild(TreeNode* node) TreeNode* Folder::firstChild() { - return d->children.isEmpty() ? 0 : d->children.first(); + return d->tqchildren.isEmpty() ? 0 : d->tqchildren.first(); } TreeNode* Folder::lastChild() { - return d->children.isEmpty() ? 0 : d->children.last(); + return d->tqchildren.isEmpty() ? 0 : d->tqchildren.last(); } bool Folder::isOpen() const @@ -246,8 +246,8 @@ int Folder::totalCount() const { int totalCount = 0; - TQValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) totalCount += (*it)->totalCount(); return totalCount; @@ -257,8 +257,8 @@ void Folder::updateUnreadCount() { int unread = 0; - TQValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) unread += (*it)->unread(); d->unread = unread; @@ -267,8 +267,8 @@ void Folder::updateUnreadCount() void Folder::slotMarkAllArticlesAsRead() { setNotificationMode(false); - TQValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) (*it)->slotMarkAllArticlesAsRead(); setNotificationMode(true, true); } @@ -281,7 +281,7 @@ void Folder::slotChildChanged(TreeNode* /*node*/) void Folder::slotChildDestroyed(TreeNode* node) { - d->children.remove(node); + d->tqchildren.remove(node); updateUnreadCount(); nodeModified(); } @@ -289,16 +289,16 @@ void Folder::slotChildDestroyed(TreeNode* node) void Folder::slotDeleteExpiredArticles() { setNotificationMode(false); - TQValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) (*it)->slotDeleteExpiredArticles(); setNotificationMode(true, true); } void Folder::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly) { - TQValueList<TreeNode*>::ConstIterator en = d->children.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) (*it)->slotAddToFetchQueue(queue, intervalFetchOnly); } @@ -332,13 +332,13 @@ TreeNode* Folder::next() if ( nextSibling() ) return nextSibling(); - Folder* p = parent(); + Folder* p = tqparent(); while (p) { if ( p->nextSibling() ) return p->nextSibling(); else - p = p->parent(); + p = p->tqparent(); } return 0; } diff --git a/akregator/src/folder.h b/akregator/src/folder.h index bb5529bc3..32811f679 100644 --- a/akregator/src/folder.h +++ b/akregator/src/folder.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_FOLDER_H @@ -44,6 +44,7 @@ namespace Akregator class Folder : public TreeNode { Q_OBJECT + TQ_OBJECT public: /** creates a feed group parsed from a XML dom element. Child nodes are not inserted or parsed. @@ -54,41 +55,41 @@ namespace Akregator /** Creates a new folder with a given title @param title The title of the feed group */ - Folder(const TQString& title = TQString::null); + Folder(const TQString& title = TQString()); virtual ~Folder(); virtual bool accept(TreeNodeVisitor* visitor); - /** returns recursively concatenated articles of children - @return an article sequence containing articles of children */ - virtual TQValueList<Article> articles(const TQString& tag=TQString::null); + /** returns recursively concatenated articles of tqchildren + @return an article sequence containing articles of tqchildren */ + virtual TQValueList<Article> articles(const TQString& tag=TQString()); /** returns a list of all tags occurring in the subtree of this folder */ virtual TQStringList tags() const; - /** returns the number of unread articles in all children + /** returns the number of unread articles in all tqchildren @return number of unread articles */ virtual int unread() const; - /** returns the number of articles in all children + /** returns the number of articles in all tqchildren @return number of articles */ virtual int totalCount() const; /** Helps the rest of the app to decide if node should be handled as group or not. Use only where necessary, use polymorphism where possible. */ virtual bool isGroup() const { return true; } - /** converts the feed group into OPML format for save and export and appends it to node @c parent in document @document. + /** converts the feed group into OPML format for save and export and appends it to node @c tqparent in document @document. Children are processed and appended recursively. - @param parent The parent element + @param tqparent The tqparent element @param document The DOM document @return The newly created element representing this feed group */ - virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const; - /** returns the (direct) children of this node. + /** returns the (direct) tqchildren of this node. @return a list of pointers to the child nodes */ - virtual TQValueList<TreeNode*> children() const; + virtual TQValueList<TreeNode*> tqchildren() const; /** inserts @c node as child after child node @c after. if @c after is not a child of this group, @c node will be inserted as first child @@ -104,7 +105,7 @@ namespace Akregator @param node the tree node to insert */ virtual void appendChild(TreeNode* node); - /** remove @c node from children. Note that @c node will not be deleted + /** remove @c node from tqchildren. Note that @c node will not be deleted @param node the child node to remove */ virtual void removeChild(TreeNode* node); @@ -133,7 +134,7 @@ namespace Akregator /** Delete expired articles recursively. */ virtual void slotDeleteExpiredArticles(); - /** Mark articles of children recursively as read. */ + /** Mark articles of tqchildren recursively as read. */ virtual void slotMarkAllArticlesAsRead(); /** Called when a child was modified. @@ -146,7 +147,7 @@ namespace Akregator */ virtual void slotChildDestroyed(TreeNode* node); - /** enqueues children recursively for fetching + /** enqueues tqchildren recursively for fetching @param queue a fetch queue @param internvalFetchesOnly */ virtual void slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchesOnly=false); diff --git a/akregator/src/folderitem.cpp b/akregator/src/folderitem.cpp index 6a3c0c055..baab25f3f 100644 --- a/akregator/src/folderitem.cpp +++ b/akregator/src/folderitem.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "actionmanager.h" @@ -33,22 +33,22 @@ namespace Akregator { -FolderItem::FolderItem(FolderItem* parent, Folder* node) : TreeNodeItem(parent, node) +FolderItem::FolderItem(FolderItem* tqparent, Folder* node) : TreeNodeItem(tqparent, node) { initialize(node); } -FolderItem::FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node) +FolderItem::FolderItem(FolderItem* tqparent, TreeNodeItem* after, Folder* node) : TreeNodeItem(tqparent, after, node) { initialize(node); } -FolderItem::FolderItem(KListView* parent, Folder* node) : TreeNodeItem(parent, node) +FolderItem::FolderItem(KListView* tqparent, Folder* node) : TreeNodeItem(tqparent, node) { initialize(node); } -FolderItem::FolderItem(KListView* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node) +FolderItem::FolderItem(KListView* tqparent, TreeNodeItem* after, Folder* node) : TreeNodeItem(tqparent, after, node) { initialize(node); } diff --git a/akregator/src/folderitem.h b/akregator/src/folderitem.h index 9f8dcec52..02516e032 100644 --- a/akregator/src/folderitem.h +++ b/akregator/src/folderitem.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_FOLDERITEM_H #define AKREGATOR_FOLDERITEM_H @@ -41,10 +41,10 @@ class FolderItem : public TreeNodeItem { public: - FolderItem(FolderItem* parent, Folder* node); - FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node); - FolderItem(KListView* parent, Folder* node); - FolderItem(KListView* parent, TreeNodeItem* after, Folder* node); + FolderItem(FolderItem* tqparent, Folder* node); + FolderItem(FolderItem* tqparent, TreeNodeItem* after, Folder* node); + FolderItem(KListView* tqparent, Folder* node); + FolderItem(KListView* tqparent, TreeNodeItem* after, Folder* node); virtual ~FolderItem(); virtual Folder* node(); diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 85419931a..55fac570e 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqregexp.h> @@ -37,8 +37,8 @@ namespace Akregator { -Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, const TQString& tit, bool watchSignals) - :TQObject(parent, "aKregatorFrame") +Frame::Frame(TQObject * tqparent, KParts::ReadOnlyPart *p, TQWidget *visWidget, const TQString& tit, bool watchSignals) + :TQObject(tqparent, "aKregatorFrame") { m_autoDeletePart = false; m_part=p; @@ -146,7 +146,7 @@ void Frame::setState(int a) emit started(); break; case Frame::Canceled: - emit canceled(TQString::null); + emit canceled(TQString()); break; case Frame::Idle: case Frame::Completed: @@ -174,8 +174,8 @@ const TQString& Frame::statusText() const void Frame::setStarted() { if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID(); - m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString::null, false); - m_progressItem->seStatus(i18n("Loading...")); + m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString(), false); + m_progressItem->setqStatus(i18n("Loading...")); //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch())); m_state=Started; emit started(); @@ -184,7 +184,7 @@ void Frame::setStarted() void Frame::setCanceled(const TQString &s) { if(m_progressItem) { - m_progressItem->seStatus(i18n("Loading canceled")); + m_progressItem->setqStatus(i18n("Loading canceled")); m_progressItem->setComplete(); m_progressItem = 0; } @@ -195,7 +195,7 @@ void Frame::setCanceled(const TQString &s) void Frame::setCompleted() { if(m_progressItem) { - m_progressItem->seStatus(i18n("Loading completed")); + m_progressItem->setqStatus(i18n("Loading completed")); m_progressItem->setComplete(); m_progressItem = 0; } diff --git a/akregator/src/frame.h b/akregator/src/frame.h index 274184029..b504cc44d 100644 --- a/akregator/src/frame.h +++ b/akregator/src/frame.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef FRAME_H @@ -40,12 +40,13 @@ namespace KPIM namespace Akregator { - class Frame : public QObject + class Frame : public TQObject { Q_OBJECT + TQ_OBJECT public: - Frame(TQObject *parent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true); + Frame(TQObject *tqparent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true); virtual ~Frame(); enum {Idle, Started, Completed, Canceled}; diff --git a/akregator/src/kcursorsaver.h b/akregator/src/kcursorsaver.h index da38eec57..e12d6e8d4 100644 --- a/akregator/src/kcursorsaver.h +++ b/akregator/src/kcursorsaver.h @@ -14,11 +14,11 @@ namespace Akregator { * As soon as it gets out of scope, it will restore the original * cursor. */ -class KCursorSaver : public Qt +class KCursorSaver : public TQt { public: /// constructor taking TQCursor tqshapes - KCursorSaver(Qt::tqCursorShape tqshape) { + KCursorSaver(TQt::tqCursorShape tqshape) { TQApplication::setOverrideCursor( TQCursor(tqshape) ); inited = true; } diff --git a/akregator/src/kernel.cpp b/akregator/src/kernel.cpp index 197333664..b5b45a4fa 100644 --- a/akregator/src/kernel.cpp +++ b/akregator/src/kernel.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "kernel.h" diff --git a/akregator/src/kernel.h b/akregator/src/kernel.h index 51204cd78..6e2adbf8e 100644 --- a/akregator/src/kernel.h +++ b/akregator/src/kernel.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_KERNEL_H diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp index 59949244b..14e0bb125 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -261,9 +261,9 @@ TQString Article::meta(const TQString &key) const return d->meta[key]; } -KURLLabel *Article::widget(TQWidget *parent, const char *name) const +KURLLabel *Article::widget(TQWidget *tqparent, const char *name) const { - KURLLabel *label = new KURLLabel(d->link.url(), d->title, parent, name); + KURLLabel *label = new KURLLabel(d->link.url(), d->title, tqparent, name); label->setUseTips(true); if (!d->description.isNull()) label->setTipText(d->description); diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h index 611dd408f..833b224a4 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -90,7 +90,7 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The headline of this article, or TQString::null if + * @return The headline of this article, or TQString() if * no headline was available. */ TQString title() const; @@ -106,7 +106,7 @@ namespace RSS /** * RSS 0.91 and upwards - * @return A story synopsis, or TQString::null if no description + * @return A story synopsis, or TQString() if no description * was available. */ TQString description() const; @@ -124,7 +124,7 @@ namespace RSS /** * RSS 2.0 and upwards - * @return If this article GUID is permalink. Has no meaning when guid() is TQString::null. + * @return If this article GUID is permalink. Has no meaning when guid() is TQString(). */ bool guidIsPermaLink() const; @@ -145,10 +145,10 @@ namespace RSS TQString meta(const TQString &key) const; /** - * @param parent The parent widget for the KURLLabel. + * @param tqparent The tqparent widget for the KURLLabel. * @param name A name for the widget which will be used internally. * @return a widget (a KURLLabel in this case) for the Article. - * This makes building a user-interface which tqcontains the + * This makes building a user-interface which contains the * information in this Article object more convenient. * The returned KURLLabel's caption will be the title(), clicking * on it will emit the URL link(), and it has a TQToolTip attached @@ -158,7 +158,7 @@ namespace RSS * Note that you have to delete the KURLLabel object returned by * this method yourself. */ - KURLLabel *widget(TQWidget *parent = 0, const char *name = 0) const; + KURLLabel *widget(TQWidget *tqparent = 0, const char *name = 0) const; typedef TQMap<TQString, TQString> MetaInfoMap; diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp index 6dc63d3bb..c020655ce 100644 --- a/akregator/src/librss/category.cpp +++ b/akregator/src/librss/category.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "category.h" @@ -116,12 +116,12 @@ bool Category::operator==(const Category &other) const TQString Category::category() const { - return !d->isNull ? d->category : TQString::null; + return !d->isNull ? d->category : TQString(); } TQString Category::domain() const { - return !d->isNull ? d->domain : TQString::null; + return !d->isNull ? d->domain : TQString(); } } // namespace RSS diff --git a/akregator/src/librss/category.h b/akregator/src/librss/category.h index 9baec64e5..0c40e418f 100644 --- a/akregator/src/librss/category.h +++ b/akregator/src/librss/category.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LIBRSS_RSS_CATEGORY_H diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index 170ceaa7e..696802ec7 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -105,7 +105,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) else d->valid=true; - attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString::null); + attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString()); if (rootNode.toElement().tagName()==TQString::tqfromLatin1("feed")) { d->format=AtomFeed; @@ -137,7 +137,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) if (d->format==UnknownFormat) { - attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString::null); + attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString()); if (!attr.isNull()) { /* * Hardcoding these URLs is actually a bad idea, since the DTD doesn't @@ -183,27 +183,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->link = extractLink(channelNode, d->format); - /* This is ugly but necessary since RSS 0.90 and 1.0 have a different parent + /* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent * node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0. */ - TQDomNode parentNode; + TQDomNode tqparentNode; if (d->version == v0_90 || d->version == v1_0 || d->format == AtomFeed) - parentNode = rootNode; + tqparentNode = rootNode; else { // following is a HACK for broken 0.91 feeds like xanga.com's if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull()) - parentNode = rootNode; + tqparentNode = rootNode; else - parentNode = channelNode; + tqparentNode = channelNode; } // image and textinput aren't supported by Atom.. handle in case feed provides - TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image")); + TQDomNode n = tqparentNode.namedItem(TQString::tqfromLatin1("image")); if (!n.isNull()) d->image = new Image(n); - n = parentNode.namedItem(TQString::tqfromLatin1("textinput")); + n = tqparentNode.namedItem(TQString::tqfromLatin1("textinput")); if (!n.isNull()) d->textInput = new TextInput(n); @@ -214,7 +214,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) else tagName=TQString::tqfromLatin1("item"); - for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { + for (n = tqparentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { const TQDomElement e = n.toElement(); if (e.tagName() == tagName) d->articles.append(Article(e, d->format, d->version)); @@ -224,7 +224,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->copyright = elemText; if (d->format == AtomFeed) - elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString::null); + elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString()); else elemText = extractNode(channelNode, TQString::tqfromLatin1("language")); @@ -541,7 +541,7 @@ TQString Document::verbVersion() const case vAtom_0_1: return TQString::tqfromLatin1("0.1"); case vAtom_1_0: return TQString::tqfromLatin1("1.0"); } - return TQString::null; + return TQString(); } TQString Document::title() const diff --git a/akregator/src/librss/document.h b/akregator/src/librss/document.h index 55ac264cc..7a94e59d4 100644 --- a/akregator/src/librss/document.h +++ b/akregator/src/librss/document.h @@ -83,7 +83,7 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The title of the RSS document, or TQString::null if no + * @return The title of the RSS document, or TQString() if no * title was available. This is often the name of the news source * from which the RSS document was retrieved. */ @@ -91,7 +91,7 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The description of the RSS document, or TQString::null + * @return The description of the RSS document, or TQString() * if no description was available. This is usually a short slogan * or description of the news source from which the RSS document * was retrieved. @@ -158,7 +158,7 @@ namespace RSS /** * RSS 0.91 and upwards * @return A copyright of the information contained in the RSS - * document, or TQString::null if no copyright is available. + * document, or TQString() if no copyright is available. */ TQString copyright() const; @@ -203,7 +203,7 @@ namespace RSS * RSS 0.91 and upwards * @return The email address of the webmaster for the site, the * person to contact if there are technical problems with the - * channel, or TQString::null if this information isn't available. + * channel, or TQString() if this information isn't available. * @see managingEditor() */ TQString webMaster() const; diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp index 864c19fce..666162683 100644 --- a/akregator/src/librss/enclosure.cpp +++ b/akregator/src/librss/enclosure.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "enclosure.h" diff --git a/akregator/src/librss/enclosure.h b/akregator/src/librss/enclosure.h index e15c86782..154f8bc06 100644 --- a/akregator/src/librss/enclosure.h +++ b/akregator/src/librss/enclosure.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LIBRSS_RSS_ENCLOSURE_H diff --git a/akregator/src/librss/feeddetector.cpp b/akregator/src/librss/feeddetector.cpp index 4407ff09f..099cc2a79 100644 --- a/akregator/src/librss/feeddetector.cpp +++ b/akregator/src/librss/feeddetector.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqregexp.h> diff --git a/akregator/src/librss/feeddetector.h b/akregator/src/librss/feeddetector.h index 94eab63b4..e5a036906 100644 --- a/akregator/src/librss/feeddetector.h +++ b/akregator/src/librss/feeddetector.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LIBRSS_FEEDDETECTOR_H diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h index 33c7a03b7..397a4aac0 100644 --- a/akregator/src/librss/global.h +++ b/akregator/src/librss/global.h @@ -42,7 +42,7 @@ namespace RSS * Possible status values returned by the signal * Loader::loadingComplete(). */ - enum Status { + enum tqStatus { Success, /** * Nothing went wrong so far, but you still have to check * what values are returned by the classes since it's not diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h index 41f7a33de..1df799ff3 100644 --- a/akregator/src/librss/image.h +++ b/akregator/src/librss/image.h @@ -31,9 +31,10 @@ namespace RSS * is via Document::image(). * @see Document::image() */ - class KDE_EXPORT Image : public QObject + class KDE_EXPORT Image : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -83,7 +84,7 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The 'caption' of this image, or TQString::null if no + * @return The 'caption' of this image, or TQString() if no * caption is available. */ TQString title() const; @@ -112,7 +113,7 @@ namespace RSS /** * RSS 0.91 and upwards * @return A description of what this picture shows, or - * TQString::null if no description is available. Useful for + * TQString() if no description is available. Useful for * people who deactivated images but want or need to know what is * shown. */ diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index 74467d01c..edc384323 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -268,7 +268,7 @@ Loader *Loader::create() Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), object, slot); return loader; } @@ -326,13 +326,13 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success) d->retriever = NULL; Document rssDoc; - Status status = Success; + tqStatus status = Success; if (success) { TQDomDocument doc; /* Some servers insert whitespace before the <?xml...?> declaration. - * QDom doesn't tolerate that (and it's right, that's invalid XML), + * TQDom doesn't tolerate that (and it's right, that's invalid XML), * so we strip that. */ diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index e958239f2..2129bc792 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -32,9 +32,10 @@ namespace RSS * a new retrieval algorithm which can then be plugged into the RSS loader. * @see Loader, FileRetriever, OutputRetriever */ - class KDE_EXPORT DataRetriever : public QObject + class KDE_EXPORT DataRetriever : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -89,6 +90,7 @@ namespace RSS class KDE_EXPORT FileRetriever : public DataRetriever { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -160,6 +162,7 @@ namespace RSS class OutputRetriever : public DataRetriever { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -208,8 +211,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), - * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); + * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), + * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, tqStatus))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * @@ -233,7 +236,7 @@ namespace RSS * 'slotLoadingComplete' method might look like this: * * \code - * void MyClass::slotLoadingComplete(Loader *loader, Document doc, Status status) + * void MyClass::slotLoadingComplete(Loader *loader, Document doc, tqStatus status) * { * // Note that Loader::~Loader() is private, so you cannot delete Loader instances. * // You don't need to do that anyway since Loader instances delete themselves. @@ -251,9 +254,10 @@ namespace RSS * loadingComplete signal goes out of scope. This is e.g. the case if you * intend to call getPixmap() on Document::image()! */ - class KDE_EXPORT Loader : public QObject + class KDE_EXPORT Loader : public TQObject { Q_OBJECT + TQ_OBJECT friend class someClassWhichDoesNotExist; public: /** @@ -318,9 +322,9 @@ namespace RSS * the case if you intend to call getPixmap() on Document::image()! * @param status A status byte telling whether there were any problems * while retrieving or parsing the data. - * @see Document, Status + * @see Document, tqStatus */ - void loadingComplete(Loader *loader, Document doc, Status status); + void loadingComplete(Loader *loader, Document doc, tqStatus status); private slots: void slotRetrieverDone(const TQByteArray &data, bool success); diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index 7d88c3d1f..571717ae3 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -19,12 +19,12 @@ static const KCmdLineOptions options[] = void Tester::test( const TQString &url ) { Loader *loader = Loader::create(); - connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); + connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ), + this, TQT_SLOT( slotLoadingComplete( Loader *, Document, tqStatus ) ) ); loader->loadFrom( url, new FileRetriever ); } -void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) +void Tester::slotLoadingComplete( Loader *loader, Document doc, tqStatus status ) { if ( status == Success ) { diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h index b84a0ab5c..18e18327d 100644 --- a/akregator/src/librss/testlibrss.h +++ b/akregator/src/librss/testlibrss.h @@ -10,16 +10,17 @@ using RSS::Loader; using RSS::Document; -using RSS::Status; +using RSS::tqStatus; -class Tester : public QObject +class Tester : public TQObject { Q_OBJECT + TQ_OBJECT public: void test( const TQString &url ); private slots: - void slotLoadingComplete( Loader *loader, Document doc, Status status ); + void slotLoadingComplete( Loader *loader, Document doc, tqStatus status ); }; #endif diff --git a/akregator/src/librss/textinput.h b/akregator/src/librss/textinput.h index 9cc873cf3..cbf5bdb6d 100644 --- a/akregator/src/librss/textinput.h +++ b/akregator/src/librss/textinput.h @@ -79,7 +79,7 @@ namespace RSS /** * RSS 0.90 and upwards * @return The title (often a label to be used for the input field) - * of the text input, or TQString::null if no title is available. + * of the text input, or TQString() if no title is available. */ TQString title() const; @@ -87,7 +87,7 @@ namespace RSS * RSS 0.90 and upwards * @return The description (usually used as a tooltip which appears * if the mouse hovers above the input field for a short time) of - * the text input, or TQString::null if no description is + * the text input, or TQString() if no description is * available. */ TQString description() const; @@ -95,7 +95,7 @@ namespace RSS /** * RSS 0.90 and upwards * @return The name of the text input (what's this for?) of the - * text input, or TQString::null, if no name is available. + * text input, or TQString(), if no name is available. */ TQString name() const; diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index e12bea883..48b4a52a0 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -24,15 +24,15 @@ time_t parseISO8601Date(const TQString &s) return 0; // error // FIXME: imho this is done in KRFCDate::parseDateISO8601() automatically, so we could omit it? -fo - if (s.find('T') != -1) + if (s.tqfind('T') != -1) return KRFCDate::parseDateISO8601(s); else return KRFCDate::parseDateISO8601(s + "T12:00:00"); } -TQString childNodesAsXML(const TQDomNode& parent) +TQString childNodesAsXML(const TQDomNode& tqparent) { - TQDomNodeList list = parent.childNodes(); + TQDomNodeList list = tqparent.childNodes(); TQString str; TQTextStream ts( &str, IO_WriteOnly ); for (uint i = 0; i < list.count(); ++i) @@ -117,11 +117,11 @@ static TQString extractAtomContent(const TQDomElement& e) return TQString(); } -TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined) +TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined) { - TQDomNode node = parent.namedItem(elemName); + TQDomNode node = tqparent.namedItem(elemName); if (node.isNull()) - return TQString::null; + return TQString(); TQDomElement e = node.toElement(); TQString result = e.text().stripWhiteSpace(); // let's assume plain text @@ -140,14 +140,14 @@ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isI result = result.simplifyWhiteSpace(); } - return result.isEmpty() ? TQString::null : result; + return result.isEmpty() ? TQString() : result; } -TQString extractTitle(const TQDomNode & parent) +TQString extractTitle(const TQDomNode & tqparent) { - TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title")); + TQDomNode node = tqparent.namedItem(TQString::tqfromLatin1("title")); if (node.isNull()) - return TQString::null; + return TQString(); TQString result = node.toElement().text(); @@ -155,7 +155,7 @@ TQString extractTitle(const TQDomNode & parent) result = result.simplifyWhiteSpace(); if (result.isEmpty()) - return TQString::null; + return TQString(); return result; } @@ -186,7 +186,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema // after removing the email, str might have // the format "(Foo M. Bar)". We cut off - // parentheses if there are any. However, if + // tqparentheses if there are any. However, if // str is of the format "Foo M. Bar (President)", // we should not cut anything. diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h index 47be905d8..900baa225 100644 --- a/akregator/src/librss/tools_p.h +++ b/akregator/src/librss/tools_p.h @@ -29,9 +29,9 @@ namespace RSS unsigned int count; }; - TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined=true); - TQString extractTitle(const TQDomNode &parent); - TQString childNodesAsXML(const TQDomNode& parent); + TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined=true); + TQString extractTitle(const TQDomNode &tqparent); + TQString childNodesAsXML(const TQDomNode& tqparent); time_t parseISO8601Date(const TQString &s); TQString parseItemAuthor(const TQDomElement& element, Format format, Version version); } diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index 608d36a01..a5b28662e 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "listtabwidget.h" @@ -152,7 +152,7 @@ void ListTabWidget::slotTabClicked(int id) } } -ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(parent, name), d(new ListTabWidgetPrivate) +ListTabWidget::ListTabWidget(TQWidget* tqparent, const char* name) : TQWidget(tqparent, name), d(new ListTabWidgetPrivate) { d->idCounter = 0; d->current = 0; diff --git a/akregator/src/listtabwidget.h b/akregator/src/listtabwidget.h index 86c148919..f720d36f1 100644 --- a/akregator/src/listtabwidget.h +++ b/akregator/src/listtabwidget.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_LISTTABWIDGET_H @@ -42,14 +42,15 @@ class TreeNode; @author Frank Osterfeld */ -class ListTabWidget : public QWidget +class ListTabWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ListTabWidget(TQWidget* parent=0, const char* name=0); + ListTabWidget(TQWidget* tqparent=0, const char* name=0); virtual ~ListTabWidget(); enum ViewMode { single, /* horizontalTabs, */ verticalTabs }; @@ -71,7 +72,7 @@ public slots: void slotItemBegin(); /** select last item in the list */ void slotItemEnd(); - /** go to parent item */ + /** go to tqparent item */ void slotItemLeft(); /** go to first child */ void slotItemRight(); diff --git a/akregator/src/main.cpp b/akregator/src/main.cpp index f6a3976cd..bfbb942f4 100644 --- a/akregator/src/main.cpp +++ b/akregator/src/main.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqstringlist.h> diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 255309ffa..c6e8d09b1 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "mainwindow.h" @@ -84,7 +84,7 @@ MainWindow::MainWindow() int statH=fontMetrics().height()+2; m_statusLabel = new KSqueezedTextLabel(this); - m_statusLabel->setTextFormat(Qt::RichText); + m_statusLabel->setTextFormat(TQt::RichText); m_statusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); m_statusLabel->setMinimumWidth( 0 ); m_statusLabel->setFixedHeight( statH ); @@ -265,7 +265,7 @@ bool MainWindow::queryClose() // Associate source to image and show the dialog: TQMimeSourceFactory::defaultFactory()->setPixmap("systray_shot", shot); - KMessageBox::information(this, i18n( "<qt><p>Closing the main window will keep Akregator running in the system tray. Use 'Quit' from the 'File' menu to quit the application.</p><p><center><img source=\"systray_shot\"></center></p></qt>" ), i18n( "Docking in System Tray" ), "hideOnCloseInfo"); + KMessageBox::information(this, i18n( "<qt><p>Closing the main window will keep Akregator running in the system tray. Use 'Quit' from the 'File' menu to quit the application.</p><p><center><img source=\"systray_shot\"></center></p></qt>" ), i18n( "TQt::Docking in System Tray" ), "hideOnCloseInfo"); hide(); return false; } diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h index 843062829..e21e330f6 100644 --- a/akregator/src/mainwindow.h +++ b/akregator/src/mainwindow.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _AKREGATOR_H_ @@ -54,6 +54,7 @@ class MainWindow; class BrowserInterface : public KParts::BrowserInterface { Q_OBJECT + TQ_OBJECT public: BrowserInterface(Akregator::MainWindow *shell, const char *name ); @@ -72,6 +73,7 @@ private: class MainWindow : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: MainWindow(); diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index a535197f6..ec0fe7b64 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.cpp +++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "feedstoragemk4impl.h" @@ -401,7 +401,7 @@ int FeedStorageMK4Impl::status(const TQString& guid) return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0; } -void FeedStorageMK4Impl::seStatus(const TQString& guid, int status) +void FeedStorageMK4Impl::setqStatus(const TQString& guid, int status) { int findidx = findArticle(guid); if (findidx == -1) @@ -799,7 +799,7 @@ void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source) setHash(guid, source->hash(guid)); setLink(guid, source->link(guid)); setPubDate(guid, source->pubDate(guid)); - seStatus(guid, source->status(guid)); + setqStatus(guid, source->status(guid)); setTitle(guid, source->title(guid)); setAuthor(guid, source->author(guid)); @@ -846,8 +846,8 @@ void FeedStorageMK4Impl::enclosure(const TQString& guid, bool& hasEnclosure, TQS if (findidx == -1) { hasEnclosure = false; - url = TQString::null; - type = TQString::null; + url = TQString(); + type = TQString(); length = -1; return; } diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h index df60b29c4..d13f04def 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.h +++ b/akregator/src/mk4storage/feedstoragemk4impl.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef FEEDSTORAGEMK4IMPL_H #define FEEDSTORAGEMK4IMPL_H @@ -46,7 +46,7 @@ class FeedStorageMK4Impl : public FeedStorage virtual int lastFetch(); virtual void setLastFetch(int lastFetch); - virtual TQStringList articles(const TQString& tag=TQString::null); + virtual TQStringList articles(const TQString& tag=TQString()); virtual TQStringList articles(const Category& cat); @@ -69,7 +69,7 @@ class FeedStorageMK4Impl : public FeedStorage virtual uint pubDate(const TQString& guid); virtual void setPubDate(const TQString& guid, uint pubdate); virtual int status(const TQString& guid); - virtual void seStatus(const TQString& guid, int status); + virtual void setqStatus(const TQString& guid, int status); virtual TQString title(const TQString& guid); virtual void setTitle(const TQString& guid, const TQString& title); virtual TQString description(const TQString& guid); @@ -80,10 +80,10 @@ class FeedStorageMK4Impl : public FeedStorage virtual void addTag(const TQString& guid, const TQString& tag); virtual void removeTag(const TQString& guid, const TQString& tag); - virtual TQStringList tags(const TQString& guid=TQString::null); + virtual TQStringList tags(const TQString& guid=TQString()); virtual void addCategory(const TQString& guid, const Category& category); - virtual TQValueList<Category> categories(const TQString& guid=TQString::null); + virtual TQValueList<Category> categories(const TQString& guid=TQString()); virtual void setAuthor(const TQString& guid, const TQString& author); virtual TQString author(const TQString& guid); diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES index 160c4bad9..1729b493a 100644 --- a/akregator/src/mk4storage/metakit/CHANGES +++ b/akregator/src/mk4storage/metakit/CHANGES @@ -203,7 +203,7 @@ Modify some recent patches that were Python 2.2 only so they would still work with 2.1. Add a view.properties() method (returning a - dict of propname -> Property) for cases where a property is masked + dict of propname -> Property) for cases where a property is tqmasked by a method name. 2003-03-01 Reverted changes in Mk4py/scxx, avoid Mk4tcl warning @@ -211,9 +211,9 @@ One was in SCXX, PWONumber.h - ouch and apologies (jcw). Changed comparison logic in mk4too.cpp (64-bit ints, new code). -2003-02-28 Fixed relaxed layout in Mk4tcl, several Mk4py fixes +2003-02-28 Fixed relaxed tqlayout in Mk4tcl, several Mk4py fixes - Use list operators to convert a Tcl layout to MK format. This used + Use list operators to convert a Tcl tqlayout to MK format. This used to crash, Tcl test 6.7 added to verify the fix. Changed test 3.1 to use a different notation for nested defs (^). @@ -298,7 +298,7 @@ 2003-01-24 Fixed cleanup order bug in Mk4tcl There was a long-standing bug in Mk4tcl, in which cleanup order of - MkPath objects caused them to access their MkWorkspace parent even + MkPath objects caused them to access their MkWorkspace tqparent even though it was already deleted. This may have caused some of the crash-on-exit bugs in the past. @@ -605,13 +605,13 @@ c4_Storage::SaveTo function, memo's would sometimes not be written, leading to a *damaged* datafile (and incorrect free-space tracking). -2002-03-15 Better configure logic, "mk::view layout" fix +2002-03-15 Better configure logic, "mk::view tqlayout" fix Many tweaks to configures, makes, and libtool setup. Get rid of the library version numbers and the special Mk4*.so targets. Instead of Mk4tcl.so use libmk4tcl.so (likewise Mk4py.so is now libmk4py.so). - Fixed "mk::view layout", it was broken by the 10-2-2002 change. + Fixed "mk::view tqlayout", it was broken by the 10-2-2002 change. 2002-03-13 Extend partial access 'B' usage @@ -658,9 +658,9 @@ causing it to detach empty top-level views, even when in use. Fixed, added s39 to test for this case. -2002-02-10 Improve Mk4tcl's "mk::view layout" +2002-02-10 Improve Mk4tcl's "mk::view tqlayout" - Avoid crash when asking for the layout of a non-existent view. Now + Avoid crash when asking for the tqlayout of a non-existent view. Now returns an error instead. 2002-02-07 Fast commit with many empty subviews @@ -996,9 +996,9 @@ M-solaris.sh and M-dyn.sh scripts need to be manually edited when choosing between CC and gcc. -2001-03-27 Double-alignment bug on Solaris +2001-03-27 Double-tqalignment bug on Solaris - Two changes (c4_Bytes in mk4.h and src/column.h) to fix an alignment + Two changes (c4_Bytes in mk4.h and src/column.h) to fix an tqalignment problem for 8-byte doubles on Solaris. This caused tests b17, b23, b24, s22, and s28 to fail. @@ -1084,7 +1084,7 @@ 2000-10-03 Fixes for Alpha Unix - Moved _item in column.h up to fix alignment sensitivity. Config.h + Moved _item in column.h up to fix tqalignment sensitivity. Config.h did not get SIZE_LONG right on Alpha Unix (0?). 2000-09-27 Contributed fixes and Python 2.0b2 @@ -1198,7 +1198,7 @@ Moved C++ member documentation out of "mk4.h" header. Added examples/ directory, with a find.py timing example. Fixed bugs in - new Mk4tcl: "$vw find" and "$vw delete end". Added tests for new + new Mk4tcl: "$vw tqfind" and "$vw delete end". Added tests for new Mk4tcl OO interface: ":mk5object.test". 2000-06-16 Improved modifiable custom viewers @@ -1614,7 +1614,7 @@ new version in c4_Sequence allocate the c4_Bytes object lazily. Faster, and decreases sequence object size (for lots of subviews). - Mk4tcl, mk::layout now returns the proper layout even if the views + Mk4tcl, mk::tqlayout now returns the proper tqlayout even if the views are empty. Solved by adding extra arg to c4_Storage::Description, to return structure of a single top-level view. Fixes "mk8basic.1", and the returned string now has one bogus list layer stripped off. diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README index 21edd0fc2..314c956b9 100644 --- a/akregator/src/mk4storage/metakit/README +++ b/akregator/src/mk4storage/metakit/README @@ -40,7 +40,7 @@ WEBSITE URLS - The main pages on the world wide web, for news and downloads: License info: http://www.equi4.com/mklicense.html Contact info: http://www.equi4.com/contact.html -ACKNOWLEDGEMENTS - Thanks to everyone who has helped shape and extend Metakit, +ACKNOWLEDGEMENTS - Thanks to everyone who has helped tqshape and extend Metakit, including Kyrill Denisenko, Mark Roseman, Gordon McMillan, Matt Newman, Christian Tismer, John Bushakra, Steve Landers, Jacob Levy, John Barnard, Nicholas Riley, Brian Kelley, and many more people who have reported bugs diff --git a/akregator/src/mk4storage/metakit/include/mk4str.h b/akregator/src/mk4storage/metakit/include/mk4str.h index 88b7a39d6..7124a29ea 100644 --- a/akregator/src/mk4storage/metakit/include/mk4str.h +++ b/akregator/src/mk4storage/metakit/include/mk4str.h @@ -96,7 +96,7 @@ d4_inline bool operator== (const char* s1, const c4_String& s2); d4_inline bool operator!= (const c4_String& s1, const char* s2); d4_inline bool operator!= (const char* s1, const c4_String& s2); -#else // Universal tqreplacement classes +#else // Universal replacement classes /// An efficient string class, modeled after the MFC version class c4_String diff --git a/akregator/src/mk4storage/metakit/include/mk4str.inl b/akregator/src/mk4storage/metakit/include/mk4str.inl index 4f95fa514..eddbefb8d 100644 --- a/akregator/src/mk4storage/metakit/include/mk4str.inl +++ b/akregator/src/mk4storage/metakit/include/mk4str.inl @@ -131,12 +131,12 @@ d4_inline bool c4_String::operator< (const c4_String& str_) const d4_inline int c4_String::Find(char ch_) const { - return find(ch_); + return tqfind(ch_); } d4_inline int c4_String::ReverseFind(char ch_) const { - return rfind(ch_); + return rtqfind(ch_); } d4_inline int c4_String::FindOneOf(const char* set_) const @@ -146,7 +146,7 @@ d4_inline int c4_String::FindOneOf(const char* set_) const d4_inline int c4_String::Find(const char* sub_) const { - return find(sub_); + return tqfind(sub_); } d4_inline c4_String c4_String::SpanIncluding(const char* set_) const diff --git a/akregator/src/mk4storage/metakit/src/custom.cpp b/akregator/src/mk4storage/metakit/src/custom.cpp index a6275cea7..6ed1d5ab3 100644 --- a/akregator/src/mk4storage/metakit/src/custom.cpp +++ b/akregator/src/mk4storage/metakit/src/custom.cpp @@ -233,7 +233,7 @@ bool c4_CustomViewer::RemoveRows(int, int) class c4_SliceViewer : public c4_CustomViewer { - c4_View _parent; + c4_View _tqparent; int _first, _limit, _step; public: @@ -249,7 +249,7 @@ public: }; c4_SliceViewer::c4_SliceViewer (c4_Sequence& seq_, int first_, int limit_, int step_) - : _parent (&seq_), _first (first_), _limit (limit_), _step (step_) + : _tqparent (&seq_), _first (first_), _limit (limit_), _step (step_) { d4_assert(_step != 0); } @@ -260,12 +260,12 @@ c4_SliceViewer::~c4_SliceViewer () c4_View c4_SliceViewer::GetTemplate() { - return _parent.Clone(); // could probably return _parent just as well + return _tqparent.Clone(); // could probably return _tqparent just as well } int c4_SliceViewer::GetSize() { - int n = _limit >= 0 ? _limit : _parent.GetSize(); + int n = _limit >= 0 ? _limit : _tqparent.GetSize(); if (n < _first) n = _first; @@ -277,14 +277,14 @@ bool c4_SliceViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1); - return _parent.GetItem(row_, col_, buf_); + return _tqparent.GetItem(row_, col_, buf_); } bool c4_SliceViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1); - _parent.SetItem(row_, col_, buf_); + _tqparent.SetItem(row_, col_, buf_); return true; } @@ -297,7 +297,7 @@ bool c4_SliceViewer::InsertRows(int pos_, c4_Cursor value_, int count_) if (_limit >= 0) _limit += count_; - _parent.InsertAt(pos_, *value_, count_); + _tqparent.InsertAt(pos_, *value_, count_); return true; } @@ -310,7 +310,7 @@ bool c4_SliceViewer::RemoveRows(int pos_, int count_) if (_limit >= 0) _limit -= count_; - _parent.RemoveAt(pos_, count_); + _tqparent.RemoveAt(pos_, count_); return true; } @@ -323,7 +323,7 @@ c4_CustomViewer* f4_CustSlice(c4_Sequence& seq_, int first_, int limit_, int ste class c4_ProductViewer : public c4_CustomViewer { - c4_View _parent, _argView, _template; + c4_View _tqparent, _argView, _template; public: c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_); @@ -335,7 +335,7 @@ public: }; c4_ProductViewer::c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_) - : _parent (&seq_), _argView (view_), _template (_parent.Clone()) + : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone()) { for (int i = 0; i < _argView.NumProperties(); ++i) _template.AddProperty(_argView.NthProperty(i)); @@ -352,12 +352,12 @@ c4_View c4_ProductViewer::GetTemplate() int c4_ProductViewer::GetSize() { - return _parent.GetSize() * _argView.GetSize(); + return _tqparent.GetSize() * _argView.GetSize(); } bool c4_ProductViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; if (col_ < v.NumProperties()) { @@ -384,7 +384,7 @@ c4_CustomViewer* f4_CustProduct(c4_Sequence& seq_, const c4_View& view_) class c4_RemapWithViewer : public c4_CustomViewer { - c4_View _parent, _argView; + c4_View _tqparent, _argView; public: c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_); @@ -397,7 +397,7 @@ public: }; c4_RemapWithViewer::c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_) - : _parent (&seq_), _argView (view_) + : _tqparent (&seq_), _argView (view_) { } @@ -407,7 +407,7 @@ c4_RemapWithViewer::~c4_RemapWithViewer () c4_View c4_RemapWithViewer::GetTemplate() { - return _parent.Clone(); // could probably return _parent just as well + return _tqparent.Clone(); // could probably return _tqparent just as well } int c4_RemapWithViewer::GetSize() @@ -422,7 +422,7 @@ bool c4_RemapWithViewer::GetItem(int row_, int col_, c4_Bytes& buf_) row_ = ((const c4_IntProp&) map) (_argView[row_]); - return _parent.GetItem(row_, col_, buf_); + return _tqparent.GetItem(row_, col_, buf_); } bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) @@ -432,7 +432,7 @@ bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) row_ = ((const c4_IntProp&) map) (_argView[row_]); - _parent.SetItem(row_, col_, buf_); + _tqparent.SetItem(row_, col_, buf_); return true; } @@ -445,7 +445,7 @@ c4_CustomViewer* f4_CustRemapWith(c4_Sequence& seq_, const c4_View& view_) class c4_PairViewer : public c4_CustomViewer { - c4_View _parent, _argView, _template; + c4_View _tqparent, _argView, _template; public: c4_PairViewer (c4_Sequence& seq_, const c4_View& view_); @@ -460,7 +460,7 @@ public: }; c4_PairViewer::c4_PairViewer (c4_Sequence& seq_, const c4_View& view_) - : _parent (&seq_), _argView (view_), _template (_parent.Clone()) + : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone()) { for (int i = 0; i < _argView.NumProperties(); ++i) _template.AddProperty(_argView.NthProperty(i)); @@ -477,12 +477,12 @@ c4_View c4_PairViewer::GetTemplate() int c4_PairViewer::GetSize() { - return _parent.GetSize(); + return _tqparent.GetSize(); } bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; if (col_ >= v.NumProperties()) { @@ -496,7 +496,7 @@ bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_) bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; if (col_ >= v.NumProperties()) { @@ -511,14 +511,14 @@ bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) bool c4_PairViewer::InsertRows(int pos_, c4_Cursor value_, int count_) { - _parent.InsertAt(pos_, *value_, count_); + _tqparent.InsertAt(pos_, *value_, count_); _argView.InsertAt(pos_, *value_, count_); return true; } bool c4_PairViewer::RemoveRows(int pos_, int count_) { - _parent.RemoveAt(pos_, count_); + _tqparent.RemoveAt(pos_, count_); _argView.RemoveAt(pos_, count_); return true; } @@ -532,7 +532,7 @@ c4_CustomViewer* f4_CustPair(c4_Sequence& seq_, const c4_View& view_) class c4_ConcatViewer : public c4_CustomViewer { - c4_View _parent, _argView; + c4_View _tqparent, _argView; public: c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_); @@ -545,7 +545,7 @@ public: }; c4_ConcatViewer::c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_) - : _parent (&seq_), _argView (view_) + : _tqparent (&seq_), _argView (view_) { } @@ -555,23 +555,23 @@ c4_ConcatViewer::~c4_ConcatViewer () c4_View c4_ConcatViewer::GetTemplate() { - return _parent.Clone(); // could probably return _parent just as well + return _tqparent.Clone(); // could probably return _tqparent just as well } int c4_ConcatViewer::GetSize() { - return _parent.GetSize() + _argView.GetSize(); + return _tqparent.GetSize() + _argView.GetSize(); } bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; - if (row_ >= _parent.GetSize()) + if (row_ >= _tqparent.GetSize()) { v = _argView; - row_ -= _parent.GetSize(); - col_ = v.FindProperty(_parent.NthProperty(col_).GetId()); + row_ -= _tqparent.GetSize(); + col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId()); if (col_ < 0) return false; @@ -582,13 +582,13 @@ bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_) bool c4_ConcatViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; - if (row_ >= _parent.GetSize()) + if (row_ >= _tqparent.GetSize()) { v = _argView; - row_ -= _parent.GetSize(); - col_ = v.FindProperty(_parent.NthProperty(col_).GetId()); + row_ -= _tqparent.GetSize(); + col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId()); d4_assert(col_ >= 0); } @@ -605,7 +605,7 @@ c4_CustomViewer* f4_CustConcat(c4_Sequence& seq_, const c4_View& view_) class c4_RenameViewer : public c4_CustomViewer { - c4_View _parent, _template; + c4_View _tqparent, _template; public: c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_, @@ -622,11 +622,11 @@ public: c4_RenameViewer::c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_, const c4_Property& new_) - : _parent (&seq_) + : _tqparent (&seq_) { - for (int i = 0; i < _parent.NumProperties(); ++i) + for (int i = 0; i < _tqparent.NumProperties(); ++i) { - const c4_Property& prop = _parent.NthProperty(i); + const c4_Property& prop = _tqparent.NthProperty(i); _template.AddProperty(prop.GetId() == old_.GetId() ? new_ : prop); } } @@ -642,17 +642,17 @@ c4_View c4_RenameViewer::GetTemplate() int c4_RenameViewer::GetSize() { - return _parent.GetSize(); + return _tqparent.GetSize(); } bool c4_RenameViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - return _parent.GetItem(row_, col_, buf_); + return _tqparent.GetItem(row_, col_, buf_); } bool c4_RenameViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { - _parent.SetItem(row_, col_, buf_); + _tqparent.SetItem(row_, col_, buf_); return true; } @@ -666,7 +666,7 @@ c4_CustomViewer* f4_CustRename(c4_Sequence& seq_, const c4_Property& old_, class c4_GroupByViewer : public c4_CustomViewer { - c4_View _parent, _keys, _sorted, _temp; + c4_View _tqparent, _keys, _sorted, _temp; c4_Property _result; c4_DWordArray _map; @@ -685,9 +685,9 @@ public: c4_GroupByViewer::c4_GroupByViewer (c4_Sequence& seq_, const c4_View& keys_, const c4_Property& result_) - : _parent (&seq_), _keys (keys_), _result (result_) + : _tqparent (&seq_), _keys (keys_), _result (result_) { - _sorted = _parent.SortOn(_keys); + _sorted = _tqparent.SortOn(_keys); int n = _sorted.GetSize(); c4_Bytes temp; @@ -804,7 +804,7 @@ c4_CustomViewer* f4_CustGroupBy(c4_Sequence& seq_, const c4_View& template_, class c4_JoinPropViewer : public c4_CustomViewer { - c4_View _parent, _template; + c4_View _tqparent, _template; c4_ViewProp _sub; int _subPos, _subWidth; c4_DWordArray _base, _offset; @@ -820,20 +820,20 @@ public: c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_, const c4_ViewProp& sub_, bool outer_) - : _parent (&seq_), - _sub (sub_), _subPos (_parent.FindProperty(sub_.GetId())), _subWidth (0) + : _tqparent (&seq_), + _sub (sub_), _subPos (_tqparent.FindProperty(sub_.GetId())), _subWidth (0) { d4_assert(_subPos >= 0); - for (int k = 0; k < _parent.NumProperties(); ++k) + for (int k = 0; k < _tqparent.NumProperties(); ++k) { if (k != _subPos) - _template.AddProperty(_parent.NthProperty(k)); + _template.AddProperty(_tqparent.NthProperty(k)); else // if there are no rows, then this join does very little anyway //! OOPS: if this is an unattached view, then the subviews can differ - if (_parent.GetSize() > 0) + if (_tqparent.GetSize() > 0) { - c4_View view = sub_ (_parent[0]); + c4_View view = sub_ (_tqparent[0]); for (int l = 0; l < view.NumProperties(); ++l) { _template.AddProperty(view.NthProperty(l)); @@ -845,9 +845,9 @@ c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_, _base.SetSize(0, 5); _offset.SetSize(0, 5); - for (int i = 0; i < _parent.GetSize(); ++i) + for (int i = 0; i < _tqparent.GetSize(); ++i) { - c4_View v = _sub (_parent[i]); + c4_View v = _sub (_tqparent[i]); int n = v.GetSize(); if (n == 0 && outer_) @@ -880,7 +880,7 @@ int c4_JoinPropViewer::GetSize() bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; int r = _base.GetAt(row_); if (col_ >= _subPos) @@ -890,7 +890,7 @@ bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_) } else { - v = _sub (_parent[r]); + v = _sub (_tqparent[r]); r = _offset.GetAt(row_); if (r < 0) return false; // if this is a null row in an outer join @@ -913,7 +913,7 @@ c4_CustomViewer* f4_CustJoinProp(c4_Sequence& seq_, class c4_JoinViewer : public c4_CustomViewer { - c4_View _parent, _argView, _template; + c4_View _tqparent, _argView, _template; c4_DWordArray _base, _offset; public: @@ -928,14 +928,14 @@ public: c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_, const c4_View& view_, bool outer_) - : _parent (&seq_), _argView (view_.SortOn(keys_)) + : _tqparent (&seq_), _argView (view_.SortOn(keys_)) { // why not in GetTemplate, since we don't need to know this... - _template = _parent.Clone(); + _template = _tqparent.Clone(); for (int l = 0; l < _argView.NumProperties(); ++l) _template.AddProperty(_argView.NthProperty(l)); - c4_View sorted = _parent.SortOn(keys_).Project(keys_); + c4_View sorted = _tqparent.SortOn(keys_).Project(keys_); c4_View temp = _argView.Project(keys_); _base.SetSize(0, 5); @@ -945,7 +945,7 @@ c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_, for (int i = 0; i < sorted.GetSize(); ++i) { - int orig = _parent.GetIndexOf(sorted[i]); + int orig = _tqparent.GetIndexOf(sorted[i]); d4_assert(orig >= 0); if (i > 0 && sorted[i] == sorted[i-1]) @@ -1009,7 +1009,7 @@ int c4_JoinViewer::GetSize() bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; int r = _base.GetAt(row_); if (col_ >= v.NumProperties()) @@ -1030,7 +1030,7 @@ bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_) #if 0 bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; int o = 0; int r = _offset.GetAt(row_); diff --git a/akregator/src/mk4storage/metakit/src/field.cpp b/akregator/src/mk4storage/metakit/src/field.cpp index 3867d6b5c..ed5a45738 100644 --- a/akregator/src/mk4storage/metakit/src/field.cpp +++ b/akregator/src/mk4storage/metakit/src/field.cpp @@ -23,7 +23,7 @@ ///////////////////////////////////////////////////////////////////////////// // c4_Field -c4_Field::c4_Field (const char*& description_, c4_Field* parent_) +c4_Field::c4_Field (const char*& description_, c4_Field* tqparent_) : _type (0) { _indirect = this; @@ -47,7 +47,7 @@ c4_Field::c4_Field (const char*& description_, c4_Field* parent_) if (*description_ == '^') { ++description_; - _indirect = parent_; + _indirect = tqparent_; d4_assert(*description_ == ']'); } diff --git a/akregator/src/mk4storage/metakit/src/field.h b/akregator/src/mk4storage/metakit/src/field.h index 8bf3dc8c6..5dfc25736 100644 --- a/akregator/src/mk4storage/metakit/src/field.h +++ b/akregator/src/mk4storage/metakit/src/field.h @@ -34,7 +34,7 @@ public: c4_Field& SubField(int) const; //: Returns the description of each subfield. bool IsRepeating() const; - //: Returns true if this field tqcontains subtables. + //: Returns true if this field contains subtables. /* Field name and description */ const c4_String& Name() const; diff --git a/akregator/src/mk4storage/metakit/src/format.cpp b/akregator/src/mk4storage/metakit/src/format.cpp index 49c45bce6..aa23e7391 100644 --- a/akregator/src/mk4storage/metakit/src/format.cpp +++ b/akregator/src/mk4storage/metakit/src/format.cpp @@ -1036,7 +1036,7 @@ void c4_FormatV::SetupAllSubviews() void c4_FormatV::Define(int rows_, const t4_byte** ptr_) { if (_inited) { - // big oops: a root handler already tqcontains data + // big oops: a root handler already contains data for (int i = 0; i < _subSeqs.GetSize(); ++i) ForgetSubview(i); diff --git a/akregator/src/mk4storage/metakit/src/handler.cpp b/akregator/src/mk4storage/metakit/src/handler.cpp index 6c68c5c3f..fab473722 100644 --- a/akregator/src/mk4storage/metakit/src/handler.cpp +++ b/akregator/src/mk4storage/metakit/src/handler.cpp @@ -78,13 +78,13 @@ void c4_Handler::Move(int from_, int to_) // c4_HandlerSeq c4_HandlerSeq::c4_HandlerSeq (c4_Persist* persist_) - : _persist (persist_), _field (0), _parent (0), _numRows (0) + : _persist (persist_), _field (0), _tqparent (0), _numRows (0) { } c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_) : _persist (owner_.Persist()), _field (owner_.FindField(handler_)), - _parent (&owner_), _numRows (0) + _tqparent (&owner_), _numRows (0) { for (int i = 0; i < NumFields(); ++i) { c4_Field& field = Field(i); @@ -98,7 +98,7 @@ c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_) c4_HandlerSeq::~c4_HandlerSeq () { - const bool rootLevel = _parent == this; + const bool rootLevel = _tqparent == this; c4_Persist* pers = _persist; if (rootLevel && pers != 0) @@ -129,7 +129,7 @@ c4_Persist* c4_HandlerSeq::Persist() const void c4_HandlerSeq::DefineRoot() { d4_assert(_field == 0); - d4_assert(_parent == 0); + d4_assert(_tqparent == 0); SetNumRows(1); @@ -137,7 +137,7 @@ void c4_HandlerSeq::DefineRoot() _field = d4_new c4_Field (desc); d4_assert(!*desc); - _parent = this; + _tqparent = this; } c4_Handler* c4_HandlerSeq::CreateHandler(const c4_Property& prop_) @@ -162,7 +162,7 @@ void c4_HandlerSeq::DetachFromParent() _field = 0; } - _parent = 0; + _tqparent = 0; } void c4_HandlerSeq::DetachFromStorage(bool full_) @@ -293,7 +293,7 @@ void c4_HandlerSeq::Restructure(c4_Field& field_, bool remove_) } } - if (_parent == this) + if (_tqparent == this) delete ofld; // the root table owns its field structure tree } @@ -397,9 +397,9 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq& dst_, int dstPos c4_HandlerSeq& t1 = SubEntry(col, srcPos_); c4_HandlerSeq& t2 = dst_.SubEntry(col, dstPos_); - // adjust the parents - t1._parent = this; - t2._parent = &dst_; + // adjust the tqparents + t1._tqparent = this; + t2._tqparent = &dst_; // reattach the proper field structures t1.Restructure(Field(col), false); @@ -478,14 +478,14 @@ void c4_HandlerSeq::UnmappedAll() // construct meta view from a pre-parsed field tree structure // this will one day be converted to directly parse the description string -void c4_HandlerSeq::BuildMeta(int parent_, int colnum_, c4_View& meta_, +void c4_HandlerSeq::BuildMeta(int tqparent_, int colnum_, c4_View& meta_, const c4_Field& field_) { c4_IntProp pP ("P"), pC ("C"); c4_ViewProp pF ("F"); c4_StringProp pN ("N"), pT ("T"); - int n = meta_.Add(pP [parent_] + pC [colnum_]); + int n = meta_.Add(pP [tqparent_] + pC [colnum_]); c4_View fields = pF (meta_[n]); for (int i = 0; i < field_.NumSubFields(); ++i) { diff --git a/akregator/src/mk4storage/metakit/src/handler.h b/akregator/src/mk4storage/metakit/src/handler.h index 353d0517a..7cf2efdf6 100644 --- a/akregator/src/mk4storage/metakit/src/handler.h +++ b/akregator/src/mk4storage/metakit/src/handler.h @@ -52,7 +52,7 @@ public: virtual int ItemSize(int index_) = 0; //: Return width of specified data item. void GetBytes(int index_, c4_Bytes& buf_, bool copySmall_ =false); - //: Used for backward compatibility, should probably be tqreplaced. + //: Used for backward compatibility, should probably be replaced. virtual const void* Get(int index_, int& length_) = 0; //: Retrieves the data item at the specified index. virtual void Set(int index_, const c4_Bytes& buf_) = 0; @@ -88,7 +88,7 @@ class c4_HandlerSeq : public c4_Sequence c4_PtrArray _handlers; c4_Persist* _persist; c4_Field* _field; - c4_HandlerSeq* _parent; + c4_HandlerSeq* _tqparent; int _numRows; public: diff --git a/akregator/src/mk4storage/metakit/src/handler.inl b/akregator/src/mk4storage/metakit/src/handler.inl index 75321f9c7..10d45f3ce 100644 --- a/akregator/src/mk4storage/metakit/src/handler.inl +++ b/akregator/src/mk4storage/metakit/src/handler.inl @@ -84,7 +84,7 @@ d4_inline const c4_Sequence* c4_HandlerSeq::HandlerContext(int) const d4_inline c4_HandlerSeq& c4_HandlerSeq::Parent() const { - return *_parent; + return *_tqparent; } ///////////////////////////////////////////////////////////////////////////// diff --git a/akregator/src/mk4storage/metakit/src/persist.cpp b/akregator/src/mk4storage/metakit/src/persist.cpp index 743f47576..65a9e94eb 100644 --- a/akregator/src/mk4storage/metakit/src/persist.cpp +++ b/akregator/src/mk4storage/metakit/src/persist.cpp @@ -144,7 +144,7 @@ private: // other hand, the allocator does not know the size of used slots. // * Alternate function allows marking a specific range as occupied. // * Allocator can be initialized as either all free or all in-use. -// * Allocation info tqcontains only integers, it could be stored. +// * Allocation info contains only integers, it could be stored. // * To extend allocated slots: "occupy" extra bytes at the end. // * Generic: can be used for memory, disk files, and array entries. @@ -767,7 +767,7 @@ void c4_SaveContext::SaveIt(c4_HandlerSeq& root_, c4_Allocator** spacePtr_, * write new skip + commit "tails" at limit (no visible effect on file) * overwrite commit tail at end with a skip to this new one (equivalent) - * tqreplace header with one pointing to that internal new one (equivalent) + * replace header with one pointing to that internal new one (equivalent) * flush (now the file is valid both truncated and not-yet-truncated end = limit; diff --git a/akregator/src/mk4storage/metakit/src/remap.cpp b/akregator/src/mk4storage/metakit/src/remap.cpp index 243eca047..9bc9b440f 100644 --- a/akregator/src/mk4storage/metakit/src/remap.cpp +++ b/akregator/src/mk4storage/metakit/src/remap.cpp @@ -79,7 +79,7 @@ public: }; ///////////////////////////////////////////////////////////////////////////// -// The following tqcontains code derived froms Python's dictionaries, hence: +// The following contains code derived froms Python's dictionaries, hence: // Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, // The Netherlands. // Reduced and turned into a fast C++ class by Christian Tismer, hence: @@ -434,7 +434,7 @@ bool c4_HashViewer::InsertRows(int pos_, c4_Cursor value_, int count_) int i = Lookup(value_, n); if (i >= 0 && n > 0) { - _base.SetAt(i, *value_); // tqreplace existing + _base.SetAt(i, *value_); // replace existing return true; } @@ -944,7 +944,7 @@ bool c4_OrderedViewer::InsertRows(int, c4_Cursor value_, int count_) else { d4_assert(i < _base.GetSize()); - _base.SetAt(i, *value_); // tqreplace existing + _base.SetAt(i, *value_); // replace existing } return true; @@ -1099,7 +1099,7 @@ bool c4_IndexedViewer::InsertRows(int, c4_Cursor value_, int count_) else { d4_assert(i < _base.GetSize()); - _base.SetAt(i, *value_); // tqreplace existing + _base.SetAt(i, *value_); // replace existing } return true; diff --git a/akregator/src/mk4storage/metakit/src/store.cpp b/akregator/src/mk4storage/metakit/src/store.cpp index f43bc0e39..3a4583378 100644 --- a/akregator/src/mk4storage/metakit/src/store.cpp +++ b/akregator/src/mk4storage/metakit/src/store.cpp @@ -366,7 +366,7 @@ bool c4_Storage::SetAside(c4_Storage& aside_) { c4_Persist* pers = Persist(); bool f = pers->SetAside(aside_); - // adjust our copy when the root view has been tqreplaced + // adjust our copy when the root view has been replaced *(c4_View*) this = &pers->Root(); return f; } @@ -391,7 +391,7 @@ bool c4_Storage::Rollback(bool full_) { c4_Persist* pers = Persist(); bool f = Strategy().IsValid() && pers->Rollback(full_); - // adjust our copy when the root view has been tqreplaced + // adjust our copy when the root view has been replaced *(c4_View*) this = &pers->Root(); return f; } diff --git a/akregator/src/mk4storage/metakit/src/view.cpp b/akregator/src/mk4storage/metakit/src/view.cpp index 11e384ee7..af2fc9fa2 100644 --- a/akregator/src/mk4storage/metakit/src/view.cpp +++ b/akregator/src/mk4storage/metakit/src/view.cpp @@ -44,7 +44,7 @@ public: * On Win32, use a critical section to protect the global symbol table. * Also uses special thread-safe calls to inc/dec all reference counts. * - * This implementation tqreplaces the previous use of TLS, which cannot + * This implementation replaces the previous use of TLS, which cannot * be used without special tricks in dynamically loaded DLL's, as is * required for OCX/ActiveX use (which uses LoadLibrary). * diff --git a/akregator/src/mk4storage/metakit/tests/ok/f07a.txt b/akregator/src/mk4storage/metakit/tests/ok/f07a.txt index 79963d7b4..8f3ed2077 100644 --- a/akregator/src/mk4storage/metakit/tests/ok/f07a.txt +++ b/akregator/src/mk4storage/metakit/tests/ok/f07a.txt @@ -1,3 +1,3 @@ VIEW 1 rows = dict:V 0: subview 'dict' - VIEW 0 rows = parent:I index:I view:V + VIEW 0 rows = tqparent:I index:I view:V diff --git a/akregator/src/mk4storage/metakit/tests/regress.h b/akregator/src/mk4storage/metakit/tests/regress.h index f317bcb26..b5611e574 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.h +++ b/akregator/src/mk4storage/metakit/tests/regress.h @@ -24,7 +24,7 @@ int remove(const char*); #pragma warning (disable: 4703) // function too large for global optimizations // also no exceptions in MSVC 1.52 when used with a QuickWin target -#if defined (_QWINVER) && !defined (q4_NOTHROW) +#if defined (_TQWINVER) && !defined (q4_NOTHROW) #define q4_NOTHROW 1 #endif #endif diff --git a/akregator/src/mk4storage/metakit/tests/tformat.cpp b/akregator/src/mk4storage/metakit/tests/tformat.cpp index ba6e92549..67530b7fd 100644 --- a/akregator/src/mk4storage/metakit/tests/tformat.cpp +++ b/akregator/src/mk4storage/metakit/tests/tformat.cpp @@ -207,7 +207,7 @@ void TestFormat() c4_View v3 = pView (v2[0]); A(v3.GetSize() == 2); */ - #define FORMAT07 "dict[parent:I,index:I,view[name:S,type:S,child:I]]" + #define FORMAT07 "dict[tqparent:I,index:I,view[name:S,type:S,child:I]]" c4_Storage s1 ("f07a", 1); s1.SetStructure(FORMAT07); diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp index fce697201..788087f87 100644 --- a/akregator/src/mk4storage/mk4confwidget.cpp +++ b/akregator/src/mk4storage/mk4confwidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "mk4config.h" diff --git a/akregator/src/mk4storage/mk4confwidget.h b/akregator/src/mk4storage/mk4confwidget.h index e697c21bc..3fd71ebac 100644 --- a/akregator/src/mk4storage/mk4confwidget.h +++ b/akregator/src/mk4storage/mk4confwidget.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_BACKEND_MK4CONFWIDGET_H @@ -33,6 +33,7 @@ namespace Backend { class MK4ConfWidget : public MK4ConfWidgetBase { Q_OBJECT + TQ_OBJECT public: MK4ConfWidget(); diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui index c89602373..cfa37def6 100644 --- a/akregator/src/mk4storage/mk4confwidgetbase.ui +++ b/akregator/src/mk4storage/mk4confwidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Akregator::Backend::MK4ConfWidgetBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>MK4ConfWidgetBase</cstring> </property> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>tqlayout4</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbUseDefault</cstring> </property> @@ -44,7 +44,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout3</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label</cstring> </property> @@ -72,7 +72,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>tqlayout4</cstring> </property> @@ -97,7 +97,7 @@ </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -114,7 +114,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonApply</cstring> </property> @@ -125,7 +125,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> diff --git a/akregator/src/mk4storage/mk4plugin.cpp b/akregator/src/mk4storage/mk4plugin.cpp index a475a226a..b3493be36 100644 --- a/akregator/src/mk4storage/mk4plugin.cpp +++ b/akregator/src/mk4storage/mk4plugin.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "mk4plugin.h" diff --git a/akregator/src/mk4storage/mk4plugin.h b/akregator/src/mk4storage/mk4plugin.h index b512a8096..fc9935a1f 100644 --- a/akregator/src/mk4storage/mk4plugin.h +++ b/akregator/src/mk4storage/mk4plugin.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_BACKEND_MK4PLUGIN_H diff --git a/akregator/src/mk4storage/storagefactorymk4impl.cpp b/akregator/src/mk4storage/storagefactorymk4impl.cpp index 09cacc9db..7a9cd0655 100644 --- a/akregator/src/mk4storage/storagefactorymk4impl.cpp +++ b/akregator/src/mk4storage/storagefactorymk4impl.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "storagefactorymk4impl.h" #include "storagemk4impl.h" diff --git a/akregator/src/mk4storage/storagefactorymk4impl.h b/akregator/src/mk4storage/storagefactorymk4impl.h index 85afb48ee..799e72ac6 100644 --- a/akregator/src/mk4storage/storagefactorymk4impl.h +++ b/akregator/src/mk4storage/storagefactorymk4impl.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef STORAGEFACTORYMK4IMPL_H diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp index 8fd93c556..af71d97bb 100644 --- a/akregator/src/mk4storage/storagemk4impl.cpp +++ b/akregator/src/mk4storage/storagemk4impl.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "storagemk4impl.h" #include "feedstoragemk4impl.h" @@ -85,7 +85,7 @@ TQString StorageMK4Impl::archivePath() const StorageMK4Impl::StorageMK4Impl() : d(new StorageMK4ImplPrivate) { - setArchivePath(TQString::null); // set path to default + setArchivePath(TQString()); // set path to default } TQString StorageMK4Impl::defaultArchivePath() diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h index 37e317646..aa0a92ee1 100644 --- a/akregator/src/mk4storage/storagemk4impl.h +++ b/akregator/src/mk4storage/storagemk4impl.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef STORAGEMK4IMPL_H @@ -37,6 +37,7 @@ namespace Backend { class StorageMK4Impl : public Storage { Q_OBJECT + TQ_OBJECT public: StorageMK4Impl(); @@ -50,7 +51,7 @@ class StorageMK4Impl : public Storage /** sets the directory where the metakit files will be stored. - @param archivePath the path to the archive, or TQString::null to reset it to the default. + @param archivePath the path to the archive, or TQString() to reset it to the default. */ void setArchivePath(const TQString& archivePath); @@ -105,7 +106,7 @@ class StorageMK4Impl : public Storage virtual TQString restoreTagSet() const; /** adds all feed storages from a source to this storage - existing articles are tqreplaced + existing articles are replaced */ virtual void add(Storage* source); diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp index fd49c060f..edea9c6e2 100644 --- a/akregator/src/nodelist.cpp +++ b/akregator/src/nodelist.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "folder.h" @@ -118,7 +118,7 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor NodeList* m_list; }; -NodeList::NodeList(TQObject *parent, const char *name) : d(new NodeListPrivate) +NodeList::NodeList(TQObject *tqparent, const char *name) : d(new NodeListPrivate) { d->rootNode = 0; d->addNodeVisitor = new AddNodeVisitor(this); @@ -165,9 +165,9 @@ void NodeList::clear() { Q_ASSERT(rootNode()); - TQValueList<TreeNode*> children = rootNode()->children(); + TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren(); - for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it) delete *it; // emits signal "emitSignalDestroyed" } @@ -215,8 +215,8 @@ int NodeList::generateID() void NodeList::slotNodeAdded(TreeNode* node) { - Folder* parent = node->parent(); - if ( !node || !d->flatList.tqcontains(parent) || d->flatList.tqcontains(node) ) + Folder* tqparent = node->tqparent(); + if ( !node || !d->flatList.tqcontains(tqparent) || d->flatList.tqcontains(node) ) return; addNode(node, false); @@ -230,7 +230,7 @@ void NodeList::slotNodeDestroyed(TreeNode* node) removeNode(node); } -void NodeList::slotNodeRemoved(Folder* /*parent*/, TreeNode* node) +void NodeList::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node) { if ( !node || !d->flatList.tqcontains(node) ) return; diff --git a/akregator/src/nodelist.h b/akregator/src/nodelist.h index b65078cc5..3d628ec78 100644 --- a/akregator/src/nodelist.h +++ b/akregator/src/nodelist.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_NODELIST_H @@ -45,13 +45,14 @@ namespace Akregator { class Folder; class TreeNode; -class NodeList : public QObject +class NodeList : public TQObject { Q_OBJECT + TQ_OBJECT public: - NodeList(TQObject *parent=0, const char *name=0); + NodeList(TQObject *tqparent=0, const char *name=0); virtual ~NodeList(); virtual Folder* rootNode() const; @@ -103,7 +104,7 @@ public slots: // compat with KDE-3.x assertions, remove for KDE 4 virtual void slotNodeDestroyed(TreeNode* node); virtual void slotNodeAdded(TreeNode* node); - virtual void slotNodeRemoved(Folder* parent, TreeNode* node); + virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node); public: // compat with KDE-3.x assertions, remove for KDE 4 // private: diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index b505b2b82..6220e97c0 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <klocale.h> diff --git a/akregator/src/notificationmanager.h b/akregator/src/notificationmanager.h index 9a5430343..96d898a0a 100644 --- a/akregator/src/notificationmanager.h +++ b/akregator/src/notificationmanager.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORNOTIFICATIONMANAGER_H @@ -33,9 +33,10 @@ namespace Akregator { /** this class collects notification requests (new articles etc.) and processes them using KNotify. */ -class NotificationManager : public QObject +class NotificationManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** singleton instance of notification manager */ static NotificationManager* self(); diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 90bf60082..64169225f 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "akregatorconfig.h" @@ -72,7 +72,7 @@ class PageViewer::HistoryEntry int id; HistoryEntry() {} - HistoryEntry(const KURL& u, const TQString& t=TQString::null): url(u), title(t) + HistoryEntry(const KURL& u, const TQString& t=TQString()): url(u), title(t) { id = abs( TQTime::currentTime().msecsTo( TQTime() ) ); // nasty, but should provide a reasonably unique number } @@ -95,8 +95,8 @@ class PageViewer::PageViewerPrivate }; -PageViewer::PageViewer(TQWidget *parent, const char *name) - : Viewer(parent, name), d(new PageViewerPrivate) +PageViewer::PageViewer(TQWidget *tqparent, const char *name) + : Viewer(tqparent, name), d(new PageViewerPrivate) { // this hack is necessary since the part looks for []HTML Settings] in // KGlobal::config() by default, which is wrong when running in Kontact @@ -105,7 +105,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) setXMLFile(locate("data", "akregator/pageviewer.rc"), true); - QPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); + TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); d->backAction = new KToolBarPopupAction(backForward.first, KStdAccel::shortcut(KStdAccel::Back), this, @@ -393,7 +393,7 @@ void PageViewer::slotPaletteOrFontChanged() int id = obj->tqmetaObject()->findSlot("reparseConfiguration()"); if (id == -1) return; - QUObject o[1]; + TQUObject o[1]; obj->qt_invoke(id, o); diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h index a07fd2a9b..2fb3a155c 100644 --- a/akregator/src/pageviewer.h +++ b/akregator/src/pageviewer.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PAGEVIEWER_H @@ -40,8 +40,9 @@ namespace Akregator class PageViewer : public Viewer { Q_OBJECT + TQ_OBJECT public: - PageViewer(TQWidget* parent, const char* name); + PageViewer(TQWidget* tqparent, const char* name); virtual ~PageViewer(); virtual bool openURL(const KURL &url); diff --git a/akregator/src/pageviewer.rc b/akregator/src/pageviewer.rc index dd44ee368..a7b98fee9 100644 --- a/akregator/src/pageviewer.rc +++ b/akregator/src/pageviewer.rc @@ -17,7 +17,7 @@ <Action name="viewer_copy"/> <Action name="selectAll"/> <Separator/> - <Action name="find"/> + <Action name="tqfind"/> <Action name="findNext"/> <Merge/> </Menu> diff --git a/akregator/src/plugin.cpp b/akregator/src/plugin.cpp index 9b413f5cc..599d3972c 100644 --- a/akregator/src/plugin.cpp +++ b/akregator/src/plugin.cpp @@ -22,10 +22,10 @@ Plugin::addPluginProperty( const TQString& key, const TQString& value ) } -QString +TQString Plugin::pluginProperty( const TQString& key ) { - if ( m_properties.find( key.lower() ) == m_properties.end() ) + if ( m_properties.tqfind( key.lower() ) == m_properties.end() ) return "false"; return m_properties[key.lower()]; @@ -35,7 +35,7 @@ Plugin::pluginProperty( const TQString& key ) bool Plugin::hasPluginProperty( const TQString& key ) { - return m_properties.find( key.lower() ) != m_properties.end(); + return m_properties.tqfind( key.lower() ) != m_properties.end(); } } diff --git a/akregator/src/plugin.h b/akregator/src/plugin.h index 650a4a924..2d615ccbd 100644 --- a/akregator/src/plugin.h +++ b/akregator/src/plugin.h @@ -26,10 +26,10 @@ namespace Akregator virtual bool init() = 0; /** - * TODO @param parent you must parent the widget to parent + * TODO @param tqparent you must tqparent the widget to tqparent * @return the configure widget for your plugin, create it on the heap! */ - //TODO rename configureWidget( TQWidget *parent ) + //TODO rename configureWidget( TQWidget *tqparent ) // virtual PluginConfig* configure() const { return 0; } void addPluginProperty( const TQString& key, const TQString& value ); diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp index 83e746f8f..d12016d45 100644 --- a/akregator/src/pluginmanager.cpp +++ b/akregator/src/pluginmanager.cpp @@ -43,7 +43,7 @@ KTrader::OfferList PluginManager::query( const TQString& constraint ) { // Add versioning constraint - QString + TQString str = "[X-KDE-akregator-framework-version] == "; str += TQString::number( FrameworkVersion ); str += " and "; diff --git a/akregator/src/pluginmanager.h b/akregator/src/pluginmanager.h index ca97753f4..3121bbc04 100644 --- a/akregator/src/pluginmanager.h +++ b/akregator/src/pluginmanager.h @@ -49,22 +49,22 @@ class PluginManager * The keys used in the query (Type, ServiceType, Exec) are all * fields found in the .desktop files. * - * @param constraint A constraint to limit the choices returned, TQString::null to + * @param constraint A constraint to limit the choices returned, TQString() to * get all services of the given @p servicetype * * @return A list of services that satisfy the query * @see http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html */ - static KTrader::OfferList query( const TQString& constraint = TQString::null ); + static KTrader::OfferList query( const TQString& constraint = TQString() ); /** * Load and instantiate plugin from query - * @param constraint A constraint to limit the choices returned, TQString::null to + * @param constraint A constraint to limit the choices returned, TQString() to * get all services of the given @p servicetype * @return Pointer to Plugin, or NULL if error * @see http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html */ - static Akregator::Plugin* createFromQuery( const TQString& constraint = TQString::null ); + static Akregator::Plugin* createFromQuery( const TQString& constraint = TQString() ); /** * Load and instantiate plugin from service diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp index 6535896b7..6ef94f4c9 100644 --- a/akregator/src/progressmanager.cpp +++ b/akregator/src/progressmanager.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqmap.h> @@ -168,7 +168,7 @@ void ProgressItemHandler::slotFetchStarted() d->progressItem = 0; } - d->progressItem = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), TQStyleSheet::escape( d->feed->title() ), TQString::null, true); + d->progressItem = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), TQStyleSheet::escape( d->feed->title() ), TQString(), true); connect(d->progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), d->feed, TQT_SLOT(slotAbortFetch())); } @@ -178,7 +178,7 @@ void ProgressItemHandler::slotFetchCompleted() { if (d->progressItem) { - d->progressItem->seStatus(i18n("Fetch completed")); + d->progressItem->setqStatus(i18n("Fetch completed")); d->progressItem->setComplete(); d->progressItem = 0; } @@ -188,7 +188,7 @@ void ProgressItemHandler::slotFetchError() { if (d->progressItem) { - d->progressItem->seStatus(i18n("Fetch error")); + d->progressItem->setqStatus(i18n("Fetch error")); d->progressItem->setComplete(); d->progressItem = 0; } @@ -198,7 +198,7 @@ void ProgressItemHandler::slotFetchAborted() { if (d->progressItem) { - d->progressItem->seStatus(i18n("Fetch aborted")); + d->progressItem->setqStatus(i18n("Fetch aborted")); d->progressItem->setComplete(); d->progressItem = 0; } diff --git a/akregator/src/progressmanager.h b/akregator/src/progressmanager.h index c348becc4..5b31bbf24 100644 --- a/akregator/src/progressmanager.h +++ b/akregator/src/progressmanager.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_PROGRESSMANAGER_H @@ -33,9 +33,10 @@ class TreeNode; class ProgressItemHandler; /** This class manages the progress items for all feeds */ -class ProgressManager : public QObject +class ProgressManager : public TQObject { Q_OBJECT + TQ_OBJECT public: static ProgressManager* self(); @@ -63,9 +64,10 @@ class ProgressManager : public QObject /** this class handles the creation and deletion of progress items for one feed. This is an internal class intended to be used in ProgressManager only */ -class ProgressItemHandler : public QObject +class ProgressItemHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: ProgressItemHandler(Feed* feed); virtual ~ProgressItemHandler(); diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp index 28ee7858d..658051f9a 100644 --- a/akregator/src/propertiesdialog.cpp +++ b/akregator/src/propertiesdialog.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "akregatorconfig.h" @@ -38,8 +38,8 @@ namespace Akregator { -FeedPropertiesWidget::FeedPropertiesWidget(TQWidget *parent, const char *name) - : FeedPropertiesWidgetBase(parent, name) +FeedPropertiesWidget::FeedPropertiesWidget(TQWidget *tqparent, const char *name) + : FeedPropertiesWidgetBase(tqparent, name) { } @@ -65,8 +65,8 @@ void FeedPropertiesWidget::slotUpdateCheckBoxToggled( bool enabled ) } -FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *parent, const char *name) - : KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Feed Properties"), KDialogBase::Ok|KDialogBase::Cancel) +FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *tqparent, const char *name) + : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Feed Properties"), KDialogBase::Ok|KDialogBase::Cancel) { widget=new FeedPropertiesWidget(this); setMainWidget(widget); diff --git a/akregator/src/propertiesdialog.h b/akregator/src/propertiesdialog.h index f6f853760..0c854c361 100644 --- a/akregator/src/propertiesdialog.h +++ b/akregator/src/propertiesdialog.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORPROPDIALOG_H #define AKREGATORPROPDIALOG_H @@ -33,8 +33,9 @@ namespace Akregator class FeedPropertiesWidget : public FeedPropertiesWidgetBase { Q_OBJECT + TQ_OBJECT public: - FeedPropertiesWidget(TQWidget *parent = 0, const char *name = 0); + FeedPropertiesWidget(TQWidget *tqparent = 0, const char *name = 0); ~FeedPropertiesWidget(); virtual void slotUpdateComboBoxActivated(int index); virtual void slotUpdateCheckBoxToggled(bool enabled); @@ -44,8 +45,9 @@ namespace Akregator class FeedPropertiesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FeedPropertiesDialog(TQWidget *parent = 0, const char *name = 0); + FeedPropertiesDialog(TQWidget *tqparent = 0, const char *name = 0); ~FeedPropertiesDialog(); void setFeed(Feed* feed); diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui index 3e94c7ed0..038d1b267 100644 --- a/akregator/src/propertieswidgetbase.ui +++ b/akregator/src/propertieswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Akregator::FeedPropertiesWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FeedPropertiesWidget</cstring> </property> @@ -22,11 +22,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>tqlayout8</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -56,7 +56,7 @@ <cstring>urlEdit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -90,7 +90,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>upChkbox</cstring> </property> @@ -98,7 +98,7 @@ <string>U&se a custom update interval</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>tqlayout9</cstring> </property> @@ -123,7 +123,7 @@ </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -154,7 +154,7 @@ <number>1</number> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Minutes</string> @@ -184,7 +184,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>checkBox_useNotification</cstring> </property> @@ -194,7 +194,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -205,7 +205,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>bg_feedArchive</cstring> </property> @@ -225,7 +225,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>rb_keepAllArticles</cstring> </property> @@ -233,7 +233,7 @@ <string>&Keep all articles</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>rb_limitArticleNumber</cstring> </property> @@ -241,7 +241,7 @@ <string>Limit archi&ve to:</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>rb_limitArticleAge</cstring> </property> @@ -326,7 +326,7 @@ <number>1</number> </property> </widget> - <widget class="QRadioButton" row="4" column="0" rowspan="1" colspan="4"> + <widget class="TQRadioButton" row="4" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>rb_disableArchiving</cstring> </property> @@ -334,7 +334,7 @@ <string>Di&sable archiving</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>rb_globalDefault</cstring> </property> @@ -349,7 +349,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -360,7 +360,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>tqlayout4</cstring> </property> @@ -368,7 +368,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBox_loadWebsite</cstring> </property> @@ -376,7 +376,7 @@ <string>Load the &full website when reading articles</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBox_markRead</cstring> </property> @@ -452,10 +452,10 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected" specifier="pure virtual">slotUpdateComboBoxActivated( int )</slot> <slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot> -</slots> +</Q_SLOTS> <tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index f2dd33e77..abb319af4 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "akregatorconfig.h" @@ -60,7 +60,7 @@ public: int delay; }; -SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), d(new SearchBar::SearchBarPrivate) +SearchBar::SearchBar(TQWidget* tqparent, const char* name) : TQHBox(tqparent, name), d(new SearchBar::SearchBarPrivate) { d->delay = 400; setMargin(2); @@ -81,7 +81,7 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), searchLabel->setBuddy(d->searchLine); TQLabel* statusLabel = new TQLabel(this); - statusLabel->setText( i18n("Status:") ); + statusLabel->setText( i18n("tqStatus:") ); d->searchCombo = new KComboBox(this, "searchcombo"); TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small); @@ -144,7 +144,7 @@ void SearchBar::slotClearSearch() } } -void SearchBar::slotSeStatus(int status) +void SearchBar::slotSetqStatus(int status) { d->searchCombo->setCurrentItem(status); slotSearchComboChanged(status); @@ -194,15 +194,15 @@ void SearchBar::slotActivateSearch() { case 1: // Unread { - Criterion crit1( Criterion::Status, Criterion::Equals, Article::New); - Criterion crit2( Criterion::Status, Criterion::Equals, Article::Unread); + Criterion crit1( Criterion::tqStatus, Criterion::Equals, Article::New); + Criterion crit2( Criterion::tqStatus, Criterion::Equals, Article::Unread); statusCriteria << crit1; statusCriteria << crit2; break; } case 2: // New { - Criterion crit( Criterion::Status, Criterion::Equals, Article::New); + Criterion crit( Criterion::tqStatus, Criterion::Equals, Article::New); statusCriteria << crit; break; } diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h index 8227f83f9..18cb5d07a 100644 --- a/akregator/src/searchbar.h +++ b/akregator/src/searchbar.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_SEARCHBAR_H @@ -37,13 +37,14 @@ namespace Filters class ArticleMatcher; } -class SearchBar : public QHBox +class SearchBar : public TQHBox { Q_OBJECT + TQ_OBJECT public: - SearchBar(TQWidget* parent=0, const char* name=0); + SearchBar(TQWidget* tqparent=0, const char* name=0); virtual ~SearchBar(); TQString text() const; @@ -58,7 +59,7 @@ class SearchBar : public QHBox public slots: void slotClearSearch(); - void slotSeStatus(int status); + void slotSetqStatus(int status); void slotSetText(const TQString& text); private slots: diff --git a/akregator/src/settings_advanced.cpp b/akregator/src/settings_advanced.cpp index 7a849ff9b..0aea7367f 100644 --- a/akregator/src/settings_advanced.cpp +++ b/akregator/src/settings_advanced.cpp @@ -11,7 +11,7 @@ namespace Akregator { -SettingsAdvanced::SettingsAdvanced(TQWidget* parent, const char* name) : SettingsAdvancedBase(parent, name) +SettingsAdvanced::SettingsAdvanced(TQWidget* tqparent, const char* name) : SettingsAdvancedBase(tqparent, name) { TQStringList backends = Backend::StorageFactoryRegistry::self()->list(); diff --git a/akregator/src/settings_advanced.h b/akregator/src/settings_advanced.h index 2bca66146..2186645de 100644 --- a/akregator/src/settings_advanced.h +++ b/akregator/src/settings_advanced.h @@ -17,10 +17,11 @@ namespace Backend class SettingsAdvanced : public SettingsAdvancedBase { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: - SettingsAdvanced(TQWidget* parent=0, const char* name=0); + SettingsAdvanced(TQWidget* tqparent=0, const char* name=0); /** returns the key of the currently selected factory */ TQString selectedFactory() const; diff --git a/akregator/src/settings_advancedbase.ui b/akregator/src/settings_advancedbase.ui index 3cb488682..b80b85a47 100644 --- a/akregator/src/settings_advancedbase.ui +++ b/akregator/src/settings_advancedbase.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Akregator::SettingsAdvancedBase</class> <author>Frank Osterfeld</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SettingsAdvanced</cstring> </property> @@ -20,7 +20,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox3_3_2</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -44,7 +44,7 @@ <cstring>cbBackend</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbBackendConfigure</cstring> </property> @@ -54,7 +54,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox3_3</cstring> </property> @@ -65,7 +65,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>kcfg_MarkReadDelay</cstring> </property> @@ -96,7 +96,7 @@ </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_ResetQuickFilterOnNodeChange</cstring> </property> @@ -110,7 +110,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_UseMarkReadDelay</cstring> </property> diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui index 2f40bcd5d..242d61cbd 100644 --- a/akregator/src/settings_appearance.ui +++ b/akregator/src/settings_appearance.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Akregator::SettingsAppearance</class> <author>Frank Osterfeld</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SettingsAppearance</cstring> </property> @@ -23,7 +23,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>lbl_MinimumFontSize</cstring> </property> @@ -42,7 +42,7 @@ <string>Minimum font size:</string> </property> </widget> - <widget class="QSlider" row="1" column="0"> + <widget class="TQSlider" row="1" column="0"> <property name="name"> <cstring>slider_minimumFontSize</cstring> </property> @@ -73,7 +73,7 @@ <number>8</number> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>lbl_MediumFontSize</cstring> </property> @@ -81,7 +81,7 @@ <string>Medium font size:</string> </property> </widget> - <widget class="QSlider" row="3" column="0"> + <widget class="TQSlider" row="3" column="0"> <property name="name"> <cstring>slider_mediumFontSize</cstring> </property> @@ -114,7 +114,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>FontsGroupBox</cstring> </property> @@ -125,7 +125,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -138,7 +138,7 @@ <cstring>kcfg_StandardFont</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -151,7 +151,7 @@ <cstring>kcfg_FixedFont</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -164,7 +164,7 @@ <cstring>kcfg_SerifFont</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -179,7 +179,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_UnderlineLinks</cstring> </property> diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui index 86e0a303f..fbfcea0c9 100644 --- a/akregator/src/settings_archive.ui +++ b/akregator/src/settings_archive.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Akregator::SettingsArchive</class> <author>Frank Osterfeld</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SettingsArchive</cstring> </property> @@ -23,7 +23,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>tqlayout1</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>kcfg_ArchiveMode</cstring> </property> @@ -42,7 +42,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>rb_KeepAllArticles</cstring> </property> @@ -50,7 +50,7 @@ <string>Keep all articles</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>rb_LimitArticleNumber</cstring> </property> @@ -58,7 +58,7 @@ <string>Limit feed archive size to:</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>rb_LimitArticleAge</cstring> </property> @@ -66,7 +66,7 @@ <string>Delete articles older than: </string> </property> </widget> - <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>rb_DisableArchiving</cstring> </property> @@ -125,7 +125,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DoNotExpireImportantArticles</cstring> </property> diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui index af9798e3c..4318f4cc4 100644 --- a/akregator/src/settings_browser.ui +++ b/akregator/src/settings_browser.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Akregator::SettingsBrowser</class> <author>Gary Cramblitt</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SettingsBrowser</cstring> </property> @@ -23,7 +23,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_ExternalBrowserUseKdeDefault</cstring> </property> @@ -48,7 +48,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>kcfg_ExternalBrowserUseCustomCommand</cstring> </property> @@ -56,7 +56,7 @@ <string>Use this command:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>kcfg_ExternalBrowserCustomCommand</cstring> </property> @@ -69,7 +69,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>kcfg_CloseButtonOnTabs</cstring> </property> @@ -94,7 +94,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>tqlayout2</cstring> </property> @@ -102,7 +102,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Open in Tab</string> @@ -130,7 +130,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -146,7 +146,7 @@ <string>Middle mouse click:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -162,7 +162,7 @@ <string>Left mouse click:</string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>Open in Tab</string> diff --git a/akregator/src/settings_general.ui b/akregator/src/settings_general.ui index 26ef92994..27af880ab 100644 --- a/akregator/src/settings_general.ui +++ b/akregator/src/settings_general.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Akregator::SettingsGeneral</class> <author>Teemu Rytilahti</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SettingsGeneral</cstring> </property> @@ -23,7 +23,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox3_2</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_UseIntervalFetch</cstring> </property> @@ -42,7 +42,7 @@ <string>&Use interval fetching</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_UseNotifications</cstring> </property> @@ -56,7 +56,7 @@ <string>Select this if you want to get notified when there are new articles.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_ShowTrayIcon</cstring> </property> @@ -64,7 +64,7 @@ <string>Show tra&y icon</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -75,7 +75,7 @@ <string>Fetch feeds every:</string> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>kcfg_AutoFetchInterval</cstring> </property> @@ -100,7 +100,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -111,7 +111,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_MarkAllFeedsReadOnStartup</cstring> </property> @@ -119,7 +119,7 @@ <string>Mark &all feeds as read on startup</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>kcfg_FetchOnStartup</cstring> </property> @@ -146,7 +146,7 @@ </size> </property> </spacer> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox3_3</cstring> </property> @@ -157,7 +157,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_UseHTMLCache</cstring> </property> diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index cd991a49b..57612bd47 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "feedlist.h" @@ -44,8 +44,8 @@ class SelectNodeDialog::SelectNodeDialogPrivate SimpleNodeSelector* widget; }; -SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* parent, char* name) : - KDialogBase(parent, name, true, i18n("Select Feed or Folder"), +SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* tqparent, char* name) : + KDialogBase(tqparent, name, true, i18n("Select Feed or Folder"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), d(new SelectNodeDialogPrivate) { d->widget = new SimpleNodeSelector(feedList, this); @@ -102,16 +102,16 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { visitTreeNode(node); - TQValueList<TreeNode*> children = node->children(); + TQValueList<TreeNode*> tqchildren = node->tqchildren(); m_view->d->nodeToItem[node]->setExpandable(true); - for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it) createItems(*it); return true; } virtual bool visitTreeNode(TreeNode* node) { - TQListViewItem* pi = node->parent() ? m_view->d->nodeToItem[node->parent()] : 0; + TQListViewItem* pi = node->tqparent() ? m_view->d->nodeToItem[node->tqparent()] : 0; KListViewItem* item = 0; if (pi != 0) @@ -131,7 +131,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor }; -SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, const char* name) : TQWidget(parent, name), d(new SimpleNodeSelectorPrivate) +SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* tqparent, const char* name) : TQWidget(tqparent, name), d(new SimpleNodeSelectorPrivate) { d->list = feedList; connect(feedList, TQT_SIGNAL(signalDestroyed(FeedList*)), this, TQT_SLOT(slotFeedListDestroyed(FeedList*))); diff --git a/akregator/src/simplenodeselector.h b/akregator/src/simplenodeselector.h index ba9ddda2d..97e87fda3 100644 --- a/akregator/src/simplenodeselector.h +++ b/akregator/src/simplenodeselector.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_SIMPLENODESELECTOR_H @@ -44,8 +44,9 @@ class SimpleNodeSelector; class SelectNodeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SelectNodeDialog(FeedList* feedList, TQWidget* parent=0, char* name=0); + SelectNodeDialog(FeedList* feedList, TQWidget* tqparent=0, char* name=0); virtual ~SelectNodeDialog(); TreeNode* selectedNode() const; @@ -63,12 +64,13 @@ class SelectNodeDialog : public KDialogBase SelectNodeDialogPrivate* d; }; -class SimpleNodeSelector : public QWidget +class SimpleNodeSelector : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SimpleNodeSelector(FeedList* feedList, TQWidget* parent=0, const char* name=0); + SimpleNodeSelector(FeedList* feedList, TQWidget* tqparent=0, const char* name=0); virtual ~SimpleNodeSelector(); TreeNode* selectedNode() const; diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp index 6263c11f0..b0fc92c92 100644 --- a/akregator/src/speechclient.cpp +++ b/akregator/src/speechclient.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "article.h" diff --git a/akregator/src/speechclient.h b/akregator/src/speechclient.h index 8a564cd80..5172130b8 100644 --- a/akregator/src/speechclient.h +++ b/akregator/src/speechclient.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_SPEECHCLIENT_H @@ -42,6 +42,7 @@ class SpeechClient : public TQObject, public KSpeech_stub, virtual public KSpeec { Q_OBJECT + TQ_OBJECT public: diff --git a/akregator/src/storage.cpp b/akregator/src/storage.cpp index b2fbf8952..09d4d3966 100644 --- a/akregator/src/storage.cpp +++ b/akregator/src/storage.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "storage.h" diff --git a/akregator/src/storage.h b/akregator/src/storage.h index 2c6a9ceb3..1899cd141 100644 --- a/akregator/src/storage.h +++ b/akregator/src/storage.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_BACKEND_STORAGE_H @@ -41,7 +41,7 @@ class FeedStorage; An archive implementation must implement Storage, FeedStorage and StorageFactory. See mk4storage for an example. */ -class AKREGATOR_EXPORT Storage : public QObject +class AKREGATOR_EXPORT Storage : public TQObject { public: @@ -105,7 +105,7 @@ class AKREGATOR_EXPORT Storage : public QObject virtual TQStringList feeds() const = 0; /** adds all feed storages from a source to this storage - existing articles are tqreplaced + existing articles are replaced */ virtual void add(Storage* source) = 0; diff --git a/akregator/src/storagedummyimpl.cpp b/akregator/src/storagedummyimpl.cpp index 43b8788d0..e8d5c4c01 100644 --- a/akregator/src/storagedummyimpl.cpp +++ b/akregator/src/storagedummyimpl.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "storagedummyimpl.h" #include "feedstoragedummyimpl.h" diff --git a/akregator/src/storagedummyimpl.h b/akregator/src/storagedummyimpl.h index 35cbdda43..05961ffca 100644 --- a/akregator/src/storagedummyimpl.h +++ b/akregator/src/storagedummyimpl.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_STORAGEDUMMYIMPL_H @@ -37,6 +37,7 @@ namespace Backend { class StorageDummyImpl : public Storage { Q_OBJECT + TQ_OBJECT public: StorageDummyImpl(); @@ -88,7 +89,7 @@ class StorageDummyImpl : public Storage virtual TQString restoreTagSet() const; /** adds all feed storages from a source to this storage - existing articles are tqreplaced + existing articles are replaced */ virtual void add(Storage* source); diff --git a/akregator/src/storagefactory.h b/akregator/src/storagefactory.h index 12f18a0b3..93ab7f753 100644 --- a/akregator/src/storagefactory.h +++ b/akregator/src/storagefactory.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_BACKEND_STORAGEFACTORY_H diff --git a/akregator/src/storagefactorydummyimpl.cpp b/akregator/src/storagefactorydummyimpl.cpp index 70f5a956d..45f9fc0a7 100644 --- a/akregator/src/storagefactorydummyimpl.cpp +++ b/akregator/src/storagefactorydummyimpl.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "storagefactorydummyimpl.h" #include "storagedummyimpl.h" diff --git a/akregator/src/storagefactorydummyimpl.h b/akregator/src/storagefactorydummyimpl.h index 0e8d2d44e..bc1a2d438 100644 --- a/akregator/src/storagefactorydummyimpl.h +++ b/akregator/src/storagefactorydummyimpl.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_STORAGEFACTORYDUMMYIMPL_H diff --git a/akregator/src/storagefactoryregistry.cpp b/akregator/src/storagefactoryregistry.cpp index f6162ef91..608c05b17 100644 --- a/akregator/src/storagefactoryregistry.cpp +++ b/akregator/src/storagefactoryregistry.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "storagefactory.h" @@ -52,7 +52,7 @@ StorageFactoryRegistry* StorageFactoryRegistry::self() bool StorageFactoryRegistry::registerFactory(StorageFactory* factory, const TQString& typestr) { - if (tqcontainsFactory(typestr)) + if (containsFactory(typestr)) return false; d->map[typestr] = factory; return true; @@ -68,7 +68,7 @@ StorageFactory* StorageFactoryRegistry::getFactory(const TQString& typestr) return d->map[typestr]; } -bool StorageFactoryRegistry::tqcontainsFactory(const TQString& typestr) const +bool StorageFactoryRegistry::containsFactory(const TQString& typestr) const { return d->map.tqcontains(typestr); } diff --git a/akregator/src/storagefactoryregistry.h b/akregator/src/storagefactoryregistry.h index 645678408..d47c42c8f 100644 --- a/akregator/src/storagefactoryregistry.h +++ b/akregator/src/storagefactoryregistry.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_BACKEND_STORAGEFACTORYREGISTRY_H @@ -45,7 +45,7 @@ class AKREGATOR_EXPORT StorageFactoryRegistry bool registerFactory(StorageFactory* factory, const TQString& typestr); void unregisterFactory(const TQString& typestr); StorageFactory* getFactory(const TQString& typestr); - bool tqcontainsFactory(const TQString& typestr) const; + bool containsFactory(const TQString& typestr) const; TQStringList list() const; diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index 3f86fa1d1..7ae02ba9f 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "tabwidget.h" @@ -63,8 +63,8 @@ class TabWidget::TabWidgetPrivate TQToolButton* tabsClose; }; -TabWidget::TabWidget(TQWidget * parent, const char *name) - :KTabWidget(parent, name), d(new TabWidgetPrivate) +TabWidget::TabWidget(TQWidget * tqparent, const char *name) + :KTabWidget(tqparent, name), d(new TabWidgetPrivate) { d->CurrentMaxLength = 30; d->currentItem = 0; @@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength ) if ( tab->iconSet() ) iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; - x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( QMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); + x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); } return x; } @@ -200,9 +200,9 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender) uint lcw=0, rcw=0; int tabBarHeight = tabBar()->tqsizeHint().height(); if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() ) - lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight ); + lcw = TQMAX( cornerWidget( TopLeft )->width(), tabBarHeight ); if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() ) - rcw = QMAX( cornerWidget( TopRight )->width(), tabBarHeight ); + rcw = TQMAX( cornerWidget( TopRight )->width(), tabBarHeight ); uint maxTabBarWidth = width() - lcw - rcw; uint newMaxLength=30; @@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress() url = view->part()->url(); - kapp->clipboard()->setText(url.prettyURL(), QClipboard::Selection); - kapp->clipboard()->setText(url.prettyURL(), QClipboard::Clipboard); + kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection); + kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard); } void TabWidget::slotCloseTab() @@ -298,8 +298,8 @@ void TabWidget::slotCloseTab() d->currentItem = currentPage(); if (indexOf(d->currentItem) == 0) return; - if (d->frames.find(d->currentItem) != NULL) - removeFrame(d->frames.find(d->currentItem)); + if (d->frames.tqfind(d->currentItem) != NULL) + removeFrame(d->frames.tqfind(d->currentItem)); delete d->currentItem; d->currentItem = 0; } @@ -323,8 +323,8 @@ void TabWidget::initiateDrag(int tab) void TabWidget::slotCloseRequest(TQWidget* widget) { - if (d->frames.find(widget) != NULL) - removeFrame(d->frames.find(widget)); + if (d->frames.tqfind(widget) != NULL) + removeFrame(d->frames.tqfind(widget)); } } // namespace Akregator diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h index b4e3722f5..bd357ad01 100644 --- a/akregator/src/tabwidget.h +++ b/akregator/src/tabwidget.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef TABWIDGET_H @@ -38,9 +38,10 @@ class Frame; class TabWidget : public KTabWidget { Q_OBJECT + TQ_OBJECT public: - TabWidget(TQWidget * parent = 0, const char *name = 0); + TabWidget(TQWidget * tqparent = 0, const char *name = 0); virtual ~TabWidget(); void addFrame(Frame *f); diff --git a/akregator/src/tag.cpp b/akregator/src/tag.cpp index 12cc7a7ff..f42724b36 100644 --- a/akregator/src/tag.cpp +++ b/akregator/src/tag.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "shared.h" diff --git a/akregator/src/tag.h b/akregator/src/tag.h index a865b6ec7..d215eb8f2 100644 --- a/akregator/src/tag.h +++ b/akregator/src/tag.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_TAG_H @@ -47,8 +47,8 @@ class Tag public: - /** creates a tag with given id, name and scheme. If name is TQString::null, the id is used as name. If id is TQString::null, the object is considered as NULL object (see isNull())*/ - Tag(const TQString& id, const TQString& name=TQString::null, const TQString& scheme=TQString::null); + /** creates a tag with given id, name and scheme. If name is TQString(), the id is used as name. If id is TQString(), the object is considered as NULL object (see isNull())*/ + Tag(const TQString& id, const TQString& name=TQString(), const TQString& scheme=TQString()); /** creates a null tag (isNull() is @c true) */ Tag(); @@ -73,7 +73,7 @@ class Tag The @c id is built using 'scheme + "/" + term': The example gets id = "http://del.icio.us/tag/foo" @encode */ - static Tag fromCategory(const TQString& term, const TQString& scheme=TQString::null, const TQString& name=TQString::null); + static Tag fromCategory(const TQString& term, const TQString& scheme=TQString(), const TQString& name=TQString()); virtual ~Tag(); diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp index 20a68eb41..75ce305ea 100644 --- a/akregator/src/tagaction.cpp +++ b/akregator/src/tagaction.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ //#include "menuitems.h" @@ -44,9 +44,9 @@ class TagAction::TagActionPrivate //TQMap<TQPopupMenu*, int> popupToId; }; -TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent) -//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name=0) - : KToggleAction(tag.name(), KShortcut(), 0, 0, parent), d(new TagActionPrivate) +TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *tqparent) +//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name=0) + : KToggleAction(tag.name(), KShortcut(), 0, 0, tqparent), d(new TagActionPrivate) { d->tag = tag; connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot); diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h index 7225f2ce2..f87606395 100644 --- a/akregator/src/tagaction.h +++ b/akregator/src/tagaction.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_TAGACTION_H @@ -38,10 +38,11 @@ class Tag; class TagAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: - TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent=0); + TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *tqparent=0); virtual ~TagAction(); //virtual int plug(TQWidget *widget, int index=-1); diff --git a/akregator/src/tagfolder.cpp b/akregator/src/tagfolder.cpp index cc9583074..bb361fce6 100644 --- a/akregator/src/tagfolder.cpp +++ b/akregator/src/tagfolder.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "tagfolder.h" @@ -52,7 +52,7 @@ bool TagFolder::accept(TreeNodeVisitor* visitor) return visitor->visitFolder(this); } -TQDomElement TagFolder::toOPML( TQDomElement /*parent*/, TQDomDocument /*document*/ ) const +TQDomElement TagFolder::toOPML( TQDomElement /*tqparent*/, TQDomDocument /*document*/ ) const { return TQDomElement(); } diff --git a/akregator/src/tagfolder.h b/akregator/src/tagfolder.h index 6e416e543..1c883ff05 100644 --- a/akregator/src/tagfolder.h +++ b/akregator/src/tagfolder.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_TAGFOLDER_H @@ -38,12 +38,12 @@ class TagFolder : public Folder { public: - TagFolder(const TQString& title = TQString::null); + TagFolder(const TQString& title = TQString()); virtual ~TagFolder(); virtual bool accept(TreeNodeVisitor* visitor); - virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const; private: class TagFolderPrivate; diff --git a/akregator/src/tagfolderitem.cpp b/akregator/src/tagfolderitem.cpp index 920827afe..fe57de4a4 100644 --- a/akregator/src/tagfolderitem.cpp +++ b/akregator/src/tagfolderitem.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "actionmanager.h" @@ -33,19 +33,19 @@ namespace Akregator { -TagFolderItem::TagFolderItem(FolderItem* parent, TagFolder* node) : FolderItem(parent, node) +TagFolderItem::TagFolderItem(FolderItem* tqparent, TagFolder* node) : FolderItem(tqparent, node) { } -TagFolderItem::TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node) +TagFolderItem::TagFolderItem(FolderItem* tqparent, TreeNodeItem* after, TagFolder* node) : FolderItem(tqparent, after, node) { } -TagFolderItem::TagFolderItem(KListView* parent, TagFolder* node) : FolderItem(parent, node) +TagFolderItem::TagFolderItem(KListView* tqparent, TagFolder* node) : FolderItem(tqparent, node) { } -TagFolderItem::TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node) +TagFolderItem::TagFolderItem(KListView* tqparent, TreeNodeItem* after, TagFolder* node) : FolderItem(tqparent, after, node) { } diff --git a/akregator/src/tagfolderitem.h b/akregator/src/tagfolderitem.h index ac339aec3..6cdefa3d5 100644 --- a/akregator/src/tagfolderitem.h +++ b/akregator/src/tagfolderitem.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_TAGFOLDERITEM_H #define AKREGATOR_TAGFOLDERITEM_H @@ -40,10 +40,10 @@ class TagFolderItem : public FolderItem { public: - TagFolderItem(FolderItem* parent, TagFolder* node); - TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node); - TagFolderItem(KListView* parent, TagFolder* node); - TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node); + TagFolderItem(FolderItem* tqparent, TagFolder* node); + TagFolderItem(FolderItem* tqparent, TreeNodeItem* after, TagFolder* node); + TagFolderItem(KListView* tqparent, TagFolder* node); + TagFolderItem(KListView* tqparent, TreeNodeItem* after, TagFolder* node); virtual ~TagFolderItem(); virtual TagFolder* node(); diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp index 3b4939cd2..35c720724 100644 --- a/akregator/src/tagnode.cpp +++ b/akregator/src/tagnode.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "article.h" @@ -131,7 +131,7 @@ TQStringList TagNode::tags() const return TQStringList(); } -TQDomElement TagNode::toOPML( TQDomElement parent, TQDomDocument document ) const +TQDomElement TagNode::toOPML( TQDomElement tqparent, TQDomDocument document ) const { return TQDomElement(); } @@ -141,13 +141,13 @@ TreeNode* TagNode::next() if ( nextSibling() ) return nextSibling(); - Folder* p = parent(); + Folder* p = tqparent(); while (p) { if ( p->nextSibling() ) return p->nextSibling(); else - p = p->parent(); + p = p->tqparent(); } return 0; } @@ -162,7 +162,7 @@ void TagNode::slotMarkAllArticlesAsRead() setNotificationMode(false); TQValueList<Article>::Iterator en = d->articles.end(); for (TQValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it) - (*it).seStatus(Article::Read); + (*it).setqStatus(Article::Read); setNotificationMode(true); } diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h index 30630f867..8598a8a24 100644 --- a/akregator/src/tagnode.h +++ b/akregator/src/tagnode.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_TAGNODE_H @@ -45,6 +45,7 @@ class TreeNodeVisitor; class TagNode : public TreeNode { Q_OBJECT + TQ_OBJECT public: @@ -79,7 +80,7 @@ public: If @c tag is not null, only articles tagged with @c tag are returned @return sequence of articles */ - virtual TQValueList<Article> articles(const TQString& tag=TQString::null); + virtual TQValueList<Article> articles(const TQString& tag=TQString()); /** returns a list of all tags occurring in this node (sub tree for folders) */ @@ -92,7 +93,7 @@ public: /** reimplemented to return an invalid element */ - virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const; /** returns the next node in the tree. Calling next() unless it returns 0 iterates through the tree in pre-order diff --git a/akregator/src/tagnodeitem.cpp b/akregator/src/tagnodeitem.cpp index 265ec5f78..ec083145c 100644 --- a/akregator/src/tagnodeitem.cpp +++ b/akregator/src/tagnodeitem.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "actionmanager.h" @@ -35,22 +35,22 @@ namespace Akregator { -TagNodeItem::TagNodeItem(FolderItem* parent, TagNode* node) : TreeNodeItem(parent, node) +TagNodeItem::TagNodeItem(FolderItem* tqparent, TagNode* node) : TreeNodeItem(tqparent, node) { initialize(node); } -TagNodeItem::TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node) +TagNodeItem::TagNodeItem(FolderItem* tqparent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(tqparent, after, node) { initialize(node); } -TagNodeItem::TagNodeItem(KListView* parent, TagNode* node) : TreeNodeItem(parent, node) +TagNodeItem::TagNodeItem(KListView* tqparent, TagNode* node) : TreeNodeItem(tqparent, node) { initialize(node); } -TagNodeItem::TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node) +TagNodeItem::TagNodeItem(KListView* tqparent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(tqparent, after, node) { initialize(node); } diff --git a/akregator/src/tagnodeitem.h b/akregator/src/tagnodeitem.h index f9ef1b1ba..f5ea5edf5 100644 --- a/akregator/src/tagnodeitem.h +++ b/akregator/src/tagnodeitem.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_TAGNODEITEM_H #define AKREGATOR_TAGNODEITEM_H @@ -37,10 +37,10 @@ class TagNodeItem : public TreeNodeItem { public: - TagNodeItem(FolderItem* parent, TagNode* node); - TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node); - TagNodeItem(KListView* parent, TagNode* node); - TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node); + TagNodeItem(FolderItem* tqparent, TagNode* node); + TagNodeItem(FolderItem* tqparent, TreeNodeItem* after, TagNode* node); + TagNodeItem(KListView* tqparent, TagNode* node); + TagNodeItem(KListView* tqparent, TreeNodeItem* after, TagNode* node); virtual ~TagNodeItem(); virtual void nodeChanged(); diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp index f1a98b62e..ba531d038 100644 --- a/akregator/src/tagnodelist.cpp +++ b/akregator/src/tagnodelist.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "feedlist.h" @@ -92,7 +92,7 @@ bool TagNodeList::insert(TagNode* tagNode) { tagNode->setId(KApplication::random()); TQString id = tagNode->tag().id(); - if (!tqcontainsTagId(id)) + if (!containsTagId(id)) { rootNode()->appendChild(tagNode); // TODO: maintain sorting d->tagIdToNodeMap[id] = tagNode; @@ -105,7 +105,7 @@ bool TagNodeList::insert(TagNode* tagNode) bool TagNodeList::remove(TagNode* tagNode) { TQString id = tagNode->tag().id(); - if (tqcontainsTagId(id)) + if (containsTagId(id)) { rootNode()->removeChild(tagNode); d->tagIdToNodeMap.remove(id); @@ -118,9 +118,9 @@ bool TagNodeList::remove(TagNode* tagNode) void TagNodeList::slotNodeDestroyed(TreeNode* node) { TagNode* tagNode = dynamic_cast<TagNode*>(node); - TQString id = tagNode ? tagNode->tag().id() : TQString::null; + TQString id = tagNode ? tagNode->tag().id() : TQString(); - if (tagNode != 0 && tqcontainsTagId(id)) + if (tagNode != 0 && containsTagId(id)) { rootNode()->removeChild(tagNode); d->tagIdToNodeMap.remove(id); @@ -133,30 +133,30 @@ void TagNodeList::slotNodeAdded(TreeNode* node) NodeList::slotNodeAdded(node); TagNode* tagNode = dynamic_cast<TagNode*>(node); - TQString id = tagNode ? tagNode->tag().id() : TQString::null; + TQString id = tagNode ? tagNode->tag().id() : TQString(); - if (tagNode != 0L && !tqcontainsTagId(id)) + if (tagNode != 0L && !containsTagId(id)) { d->tagIdToNodeMap[id] = tagNode; emit signalTagNodeAdded(tagNode); } } -void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node) +void TagNodeList::slotNodeRemoved(Folder* tqparent, TreeNode* node) { - NodeList::slotNodeRemoved(parent, node); + NodeList::slotNodeRemoved(tqparent, node); TagNode* tagNode = dynamic_cast<TagNode*>(node); - TQString id = tagNode ? tagNode->tag().id() : TQString::null; + TQString id = tagNode ? tagNode->tag().id() : TQString(); - if (parent == rootNode() && tagNode != 0L && tqcontainsTagId(id)) + if (tqparent == rootNode() && tagNode != 0L && containsTagId(id)) { d->tagIdToNodeMap.remove(id); emit signalTagNodeRemoved(tagNode); } } -bool TagNodeList::tqcontainsTagId(const TQString& tagId) +bool TagNodeList::containsTagId(const TQString& tagId) { return d->tagIdToNodeMap.tqcontains(tagId); } @@ -178,7 +178,7 @@ TQDomDocument TagNodeList::toXML() const void TagNodeList::slotTagAdded(const Tag& tag) { - if (!tqcontainsTagId(tag.id())) + if (!containsTagId(tag.id())) { insert(new TagNode(tag, d->feedList->rootNode())); } @@ -186,14 +186,14 @@ void TagNodeList::slotTagAdded(const Tag& tag) void TagNodeList::slotTagUpdated(const Tag& tag) { - if (tqcontainsTagId(tag.id())) + if (containsTagId(tag.id())) { d->tagIdToNodeMap[tag.id()]->tagChanged(); } } void TagNodeList::slotTagRemoved(const Tag& tag) { - if (tqcontainsTagId(tag.id())) + if (containsTagId(tag.id())) { delete d->tagIdToNodeMap[tag.id()]; d->tagIdToNodeMap[tag.id()] = 0; diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h index 9e67b197c..02d1bf8b0 100644 --- a/akregator/src/tagnodelist.h +++ b/akregator/src/tagnodelist.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_TAGNODELIST_H @@ -44,6 +44,7 @@ namespace Akregator { class TagNodeList : public NodeList { Q_OBJECT + TQ_OBJECT public: @@ -53,7 +54,7 @@ namespace Akregator { FeedList* feedList() const; bool insert(TagNode* tagNode); bool remove(TagNode* tagNode); - bool tqcontainsTagId(const TQString& tagId); + bool containsTagId(const TQString& tagId); TQValueList<TagNode*> toList() const; TagNode* findByTagID(const TQString& tagID); @@ -79,7 +80,7 @@ namespace Akregator { virtual void slotNodeDestroyed(TreeNode* node); virtual void slotNodeAdded(TreeNode* node); - virtual void slotNodeRemoved(Folder* parent, TreeNode* node); + virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node); private: diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp index ea4848c41..f14b7494b 100644 --- a/akregator/src/tagpropertiesdialog.cpp +++ b/akregator/src/tagpropertiesdialog.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kicondialog.h> @@ -40,7 +40,7 @@ class TagPropertiesDialog::TagPropertiesDialogPrivate TagPropertiesWidgetBase* widget; }; -TagPropertiesDialog::TagPropertiesDialog(TQWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Tag Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply), d(new TagPropertiesDialogPrivate) +TagPropertiesDialog::TagPropertiesDialog(TQWidget *tqparent, const char *name) : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Tag Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply), d(new TagPropertiesDialogPrivate) { d->widget = new TagPropertiesWidgetBase(this); setMainWidget(d->widget); diff --git a/akregator/src/tagpropertiesdialog.h b/akregator/src/tagpropertiesdialog.h index 503b6f0e0..3665bbe44 100644 --- a/akregator/src/tagpropertiesdialog.h +++ b/akregator/src/tagpropertiesdialog.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_TAGPROPERTIESDIALOG_H @@ -34,10 +34,11 @@ class Tag; class TagPropertiesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TagPropertiesDialog(TQWidget *parent=0, const char *name=0); + TagPropertiesDialog(TQWidget *tqparent=0, const char *name=0); virtual ~TagPropertiesDialog(); void setTag(const Tag& tag); diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui index d96744bba..7109b061b 100644 --- a/akregator/src/tagpropertieswidgetbase.ui +++ b/akregator/src/tagpropertieswidgetbase.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TagPropertiesWidgetBase</class> <author>Frank Osterfeld</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>tqlayout1</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -36,7 +36,7 @@ <string>Title:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>le_title</cstring> </property> @@ -60,7 +60,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>tqlayout9</cstring> </property> @@ -68,7 +68,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp index 4cfb787a9..1be7f952e 100644 --- a/akregator/src/tagset.cpp +++ b/akregator/src/tagset.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "tag.h" @@ -38,7 +38,7 @@ class TagSet::TagSetPrivate TQMap<TQString,Tag> map; }; -TagSet::TagSet(TQObject* parent) : TQObject(parent), d(new TagSetPrivate) +TagSet::TagSet(TQObject* tqparent) : TQObject(tqparent), d(new TagSetPrivate) { } @@ -72,7 +72,7 @@ void TagSet::remove(const Tag& tag) } } -bool TagSet::tqcontainsID(const TQString& id) const +bool TagSet::containsID(const TQString& id) const { return d->map.tqcontains(id); } diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h index febb47d36..637fce50f 100644 --- a/akregator/src/tagset.h +++ b/akregator/src/tagset.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_TAGSET_H @@ -44,13 +44,14 @@ class Tag; @author Frank Osterfeld */ -class TagSet : public QObject +class TagSet : public TQObject { friend class Tag; Q_OBJECT + TQ_OBJECT public: - TagSet(TQObject* parent=0); + TagSet(TQObject* tqparent=0); virtual ~TagSet(); /** adds a tag to the tag set. The tag set will emit signalTagAdded */ @@ -65,8 +66,8 @@ class TagSet : public QObject /** returns @c true if this set tqcontains @c tag */ bool tqcontains(const Tag& tag) const; - /** returns @c true if this set tqcontains a tag with a given ID */ - bool tqcontainsID(const TQString& id) const; + /** returns @c true if this set contains a tag with a given ID */ + bool containsID(const TQString& id) const; /** returns the tag with the given ID if the tag is element of the set, or a null tag if not */ Tag findByID(const TQString& id) const; diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index 680f88ca4..963e60294 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "akregatorconfig.h" @@ -57,8 +57,8 @@ void TrayIcon::setInstance(TrayIcon* trayIcon) } -TrayIcon::TrayIcon(TQWidget *parent, const char *name) - : KSystemTray(parent, name), m_unread(0) +TrayIcon::TrayIcon(TQWidget *tqparent, const char *name) + : KSystemTray(tqparent, name), m_unread(0) { m_defaultIcon=KSystemTray::loadIcon("akregator"); TQPixmap m_unreadIcon=KSystemTray::loadIcon("akregator_empty"); @@ -109,7 +109,7 @@ TQPixmap TrayIcon::takeScreenshot() const const int WIDTH = 3; int ax = g.x() - x - MARGINS -1; int ay = g.y() - y - MARGINS -1; - painter.setPen( TQPen(Qt::red/*KApplication::palette().active().highlight()*/, WIDTH) ); + painter.setPen( TQPen(TQt::red/*KApplication::palette().active().highlight()*/, WIDTH) ); painter.drawArc(ax, ay, tw + 2*MARGINS, th + 2*MARGINS, 0, 16*360); painter.end(); @@ -156,11 +156,11 @@ void TrayIcon::slotSetUnread(int unread) } TQPixmap pix(oldW, oldH); - pix.fill(Qt::white); + pix.fill(TQt::white); TQPainter p(&pix); p.setFont(f); - p.setPen(Qt::blue); - p.drawText(pix.rect(), Qt::AlignCenter, uStr); + p.setPen(TQt::blue); + p.drawText(pix.rect(), TQt::AlignCenter, uStr); pix.setMask(pix.createHeuristicMask()); TQImage img=pix.convertToImage(); @@ -177,7 +177,7 @@ void TrayIcon::slotSetUnread(int unread) void TrayIcon::viewButtonClicked() { - TQWidget *p=static_cast<TQWidget*>(parent()); + TQWidget *p=static_cast<TQWidget*>(tqparent()); KWin::forceActiveWindow(p->winId()); } diff --git a/akregator/src/trayicon.h b/akregator/src/trayicon.h index ac742ae6a..316d938b0 100644 --- a/akregator/src/trayicon.h +++ b/akregator/src/trayicon.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORTRAYICON_H @@ -35,11 +35,12 @@ namespace Akregator class TrayIcon : public KSystemTray { Q_OBJECT + TQ_OBJECT public: static TrayIcon* getInstance(); static void setInstance(TrayIcon* trayIcon); - TrayIcon(TQWidget *parent = 0, const char *name = 0); + TrayIcon(TQWidget *tqparent = 0, const char *name = 0); ~TrayIcon(); TQPixmap takeScreenshot() const; diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp index 5aa316865..58e4ae8ea 100644 --- a/akregator/src/treenode.cpp +++ b/akregator/src/treenode.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "folder.h" @@ -40,7 +40,7 @@ class TreeNode::TreeNodePrivate bool nodeChangeOccurred; bool articleChangeOccurred; TQString title; - Folder* parent; + Folder* tqparent; uint id; bool signalDestroyedEmitted; }; @@ -52,7 +52,7 @@ TreeNode::TreeNode() d->nodeChangeOccurred = false; d->articleChangeOccurred = false; d->title = ""; - d->parent = 0; + d->tqparent = 0; d->id = 0; d->signalDestroyedEmitted = false; @@ -91,35 +91,35 @@ void TreeNode::setTitle(const TQString& title) TreeNode* TreeNode::nextSibling() const { - if (!d->parent) + if (!d->tqparent) return 0; - TQValueList<TreeNode*> children = d->parent->children(); + TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren(); TreeNode* me = (TreeNode*)this; - int idx = children.findIndex(me); + int idx = tqchildren.findIndex(me); - return idx+1 < children.size() ? *(children.at(idx+1)) : 0L; + return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L; } TreeNode* TreeNode::prevSibling() const { - if (!d->parent) + if (!d->tqparent) return 0; - TQValueList<TreeNode*> children = d->parent->children(); + TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren(); TreeNode* me = (TreeNode*)this; - int idx = children.findIndex(me); - return idx > 0 ? *(d->parent->children().at(idx-1)) : 0L; + int idx = tqchildren.findIndex(me); + return idx > 0 ? *(d->tqparent->tqchildren().at(idx-1)) : 0L; } -Folder* TreeNode::parent() const +Folder* TreeNode::tqparent() const { - return d->parent; + return d->tqparent; } -void TreeNode::setParent(Folder* parent) +void TreeNode::setParent(Folder* tqparent) { - d->parent = parent; + d->tqparent = tqparent; } void TreeNode::setNotificationMode(bool doNotify, bool notifyOccurredChanges) diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h index 366677d39..d6c6f860e 100644 --- a/akregator/src/treenode.h +++ b/akregator/src/treenode.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORTREENODE_H @@ -48,9 +48,10 @@ class FetchQueue; TODO: detailed description goes here */ -class TreeNode : public QObject +class TreeNode : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -99,23 +100,23 @@ public: virtual TreeNode* prevSibling() const; - /** Returns the parent node. - @return the parent feed group, 0 if there is none */ + /** Returns the tqparent node. + @return the tqparent feed group, 0 if there is none */ - virtual Folder* parent() const; + virtual Folder* tqparent() const; - /** Sets parent node; Don't call this directly, is done automatically by + /** Sets tqparent node; Don't call this directly, is done automatically by insertChild-methods in @ref Folder. */ - virtual void setParent(Folder* parent); + virtual void setParent(Folder* tqparent); /** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree. If @c tag is not null, only articles tagged with @c tag are returned @return sequence of articles */ - virtual TQValueList<Article> articles(const TQString& tag=TQString::null) = 0; + virtual TQValueList<Article> articles(const TQString& tag=TQString()) = 0; /** returns a list of all tags occurring in this node (sub tree for folders) */ @@ -127,10 +128,10 @@ public: virtual bool isGroup() const = 0; /** exports node and child nodes to OPML (with akregator settings) - @param parent the dom element the child node will be attached to + @param tqparent the dom element the child node will be attached to @param document the opml document */ - virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const = 0; + virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const = 0; /** @param doNotify notification on changes on/off flag diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp index 02361f377..a5955a9f7 100644 --- a/akregator/src/treenodeitem.cpp +++ b/akregator/src/treenodeitem.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "treenode.h" @@ -36,25 +36,25 @@ namespace Akregator { -TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNode* node) - : KListViewItem(parent), m_node(node) +TreeNodeItem::TreeNodeItem(FolderItem* tqparent, TreeNode* node) + : KListViewItem(tqparent), m_node(node) { initialize(node); } -TreeNodeItem::TreeNodeItem(KListView* parent, TreeNode* node) - : KListViewItem(parent), m_node(node) +TreeNodeItem::TreeNodeItem(KListView* tqparent, TreeNode* node) + : KListViewItem(tqparent), m_node(node) { initialize(node); } -TreeNodeItem::TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node) : KListViewItem(parent, after), m_node(node) +TreeNodeItem::TreeNodeItem(KListView* tqparent, TreeNodeItem* after, TreeNode* node) : KListViewItem(tqparent, after), m_node(node) { initialize(node); } -TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node) - : KListViewItem(parent, after), m_node(node) +TreeNodeItem::TreeNodeItem(FolderItem* tqparent, TreeNodeItem* after, TreeNode* node) + : KListViewItem(tqparent, after), m_node(node) { initialize(node); } @@ -71,7 +71,7 @@ TreeNodeItem::~TreeNodeItem() TQString TreeNodeItem::toolTip() const { - return TQString::null; + return TQString(); } TreeNode* TreeNodeItem::node() @@ -99,9 +99,9 @@ TreeNodeItem* TreeNodeItem::nextSibling() const return static_cast<TreeNodeItem*>(KListViewItem::nextSibling()); } -FolderItem* TreeNodeItem::parent() const +FolderItem* TreeNodeItem::tqparent() const { - return static_cast<FolderItem*>(KListViewItem::parent()); + return static_cast<FolderItem*>(KListViewItem::tqparent()); } @@ -151,7 +151,7 @@ void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg, p->drawText( x, 0, width-m-x, height(), align | AlignVCenter, oldText, -1, &br ); if ( !isSelected() ) - p->setPen( Qt::blue ); // TODO: configurable + p->setPen( TQt::blue ); // TODO: configurable p->drawText( br.right(), 0, width-m-br.right(), height(), align | AlignVCenter, txt ); diff --git a/akregator/src/treenodeitem.h b/akregator/src/treenodeitem.h index b4bae9649..3b263d734 100644 --- a/akregator/src/treenodeitem.h +++ b/akregator/src/treenodeitem.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORTREENODEITEM_H @@ -43,10 +43,10 @@ class TreeNodeItem : public KListViewItem public: - TreeNodeItem(FolderItem* parent, TreeNode* node); - TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node); - TreeNodeItem(KListView* parent, TreeNode* node); - TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node); + TreeNodeItem(FolderItem* tqparent, TreeNode* node); + TreeNodeItem(FolderItem* tqparent, TreeNodeItem* after, TreeNode* node); + TreeNodeItem(KListView* tqparent, TreeNode* node); + TreeNodeItem(KListView* tqparent, TreeNodeItem* after, TreeNode* node); virtual ~TreeNodeItem(); virtual TreeNode* node(); @@ -55,7 +55,7 @@ public: virtual TQString toolTip() const; virtual TreeNodeItem* firstChild() const; virtual TreeNodeItem* nextSibling() const; - virtual FolderItem* parent() const; + virtual FolderItem* tqparent() const; virtual void showContextMenu(const TQPoint& p) = 0; diff --git a/akregator/src/treenodevisitor.cpp b/akregator/src/treenodevisitor.cpp index b35d31136..375fd3791 100644 --- a/akregator/src/treenodevisitor.cpp +++ b/akregator/src/treenodevisitor.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "treenode.h" diff --git a/akregator/src/treenodevisitor.h b/akregator/src/treenodevisitor.h index 5b3149b3d..b7affcf2e 100644 --- a/akregator/src/treenodevisitor.h +++ b/akregator/src/treenodevisitor.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_TREENODEVISITOR_H #define AKREGATOR_TREENODEVISITOR_H diff --git a/akregator/src/utils.cpp b/akregator/src/utils.cpp index eb555a752..fb7b0186f 100644 --- a/akregator/src/utils.cpp +++ b/akregator/src/utils.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "utils.h" diff --git a/akregator/src/utils.h b/akregator/src/utils.h index 7a65915b8..4a6e05ecc 100644 --- a/akregator/src/utils.h +++ b/akregator/src/utils.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATOR_UTILS_H @@ -46,7 +46,7 @@ class Utils /** * returns a file name for a URL, with chars like "/" ":" - * tqreplaced by "_". Too long URLs (>255 chars) are shortened and + * replaced by "_". Too long URLs (>255 chars) are shortened and * appended with a hash value. * */ diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 6926a151f..2c52cf433 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kaction.h> @@ -47,8 +47,8 @@ namespace Akregator { -Viewer::Viewer(TQWidget *parent, const char *name) - : KHTMLPart(parent, name), m_url(0) +Viewer::Viewer(TQWidget *tqparent, const char *name) + : KHTMLPart(tqparent, name), m_url(0) { setZoomFactor(100); setMetaRefreshEnabled(true); @@ -88,7 +88,7 @@ Viewer::~Viewer() bool Viewer::closeURL() { emit browserExtension()->loadingProgress(-1); - emit canceled(TQString::null); + emit canceled(TQString()); return KHTMLPart::closeURL(); } @@ -203,7 +203,7 @@ void Viewer::slotCopy() { TQString text = selectedText(); text.tqreplace( TQChar( 0xa0 ), ' ' ); - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::clipboard(); disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); cb->setText(text); connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); @@ -212,9 +212,9 @@ void Viewer::slotCopy() void Viewer::slotCopyLinkAddress() { if(m_url.isEmpty()) return; - QClipboard *cb = TQApplication::clipboard(); - cb->setText(m_url.prettyURL(), QClipboard::Clipboard); - cb->setText(m_url.prettyURL(), QClipboard::Selection); + TQClipboard *cb = TQApplication::clipboard(); + cb->setText(m_url.prettyURL(), TQClipboard::Clipboard); + cb->setText(m_url.prettyURL(), TQClipboard::Selection); } void Viewer::slotSelectionChanged() @@ -244,7 +244,7 @@ void Viewer::slotOpenLinkInThisTab() void Viewer::slotOpenLinkInBrowser() { - displayInExternalBrowser(m_url, TQString::null); + displayInExternalBrowser(m_url, TQString()); } void Viewer::slotSaveLinkAs() diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h index 95924e824..c6e2c4432 100644 --- a/akregator/src/viewer.h +++ b/akregator/src/viewer.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef VIEWER_H @@ -39,14 +39,15 @@ namespace Akregator class Viewer : public KHTMLPart { Q_OBJECT + TQ_OBJECT public: /** * Display article in external browser. */ - static void displayInExternalBrowser(const KURL &url, const TQString& mimetype=TQString::null); + static void displayInExternalBrowser(const KURL &url, const TQString& mimetype=TQString()); - Viewer(TQWidget* parent, const char* name); + Viewer(TQWidget* tqparent, const char* name); virtual ~Viewer(); virtual bool closeURL(); |