diff --git a/NewsLog.txt b/NewsLog.txt
index 10034235..7a71dd3a 100644
--- a/NewsLog.txt
+++ b/NewsLog.txt
@@ -66,7 +66,7 @@ Problems addressed
------------------
* kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126)
-* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872)
+* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872)
* kolab/issue4455: calendar activate/deactivate handling broken
* kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message
dialog 'store/throw away' (rt#6094)
@@ -269,7 +269,7 @@ Problems addressed
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076)
* kolab/issue4249: Crash while printing a mail without preview pane (rt#6075)
-* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032)
+* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032)
* kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930)
@@ -551,7 +551,7 @@ Problems addressed
* kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact
* kolab/issue3930: time on the Marcus Bains line doesn't change
-* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
+* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881)
* kolab/issue3481: Keep current email in front after saving an attachment (rt#5746)
* kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash
@@ -565,7 +565,7 @@ Problems addressed
* kolab/issue3065: Crash in KOAgendaItem::paintEvent
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870)
-* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
+* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845)
* kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846)
* kolab/issue3813: reccuring events show wrong dates (rt#5855)
@@ -593,7 +593,7 @@ Friday, October 2th 2009
Problems addressed
------------------
-* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog contains ???? at the bottom
+* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog tqcontains ???? at the bottom
* kolab/issue3823: mimetreeviewer doesn't show structure of forward-as-attachment message #n where #n > 1
* kolab/issue3889: Kontact crahes if opening/changing calendar view (rt#5868)
* kolab/issue3867: Save S/MIME encrypted mails unencrypted after reading them
@@ -1108,7 +1108,7 @@ Friday, November 21st 2008
Problems addressed
------------------
-* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
+* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
* kolab/issue2617 Kleopatra: After importing a p7c or p12 file the user is informed, that he has imported 0 certifictes.
* kolab/issue2620 Kleopatra throws an error message, if no .gnupg exists and no agent is running.
@@ -1125,7 +1125,7 @@ Sunday, November 9th 2008
Problems addressed
------------------
-* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
+* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
*Support the /vendor/cmu/cyrus-imapd/sharedseen annotation available in Cyrus IMAP server 2.3.9 or higher which allows to share the seen flags between all users that have access to a folder.
* Detect if the server supports shared seen flags. Also preserve the IMAP server capabilities in kmailrc so that detection also works without a prior sync.
@@ -1474,7 +1474,7 @@ Friday, February 29th 2008
Problems addressed
-------------------
-* Prevent crash after changing the layout and replying then. (778728)
+* Prevent crash after changing the tqlayout and replying then. (778728)
* kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
* "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
* kolab/issue1700 kleopatra crashes after ldap search. (780211)
@@ -1696,10 +1696,10 @@ Problems addressed
* kolab/issue2142 ( part 1 ) Make sure the file selector is shown on top of the filter dialog. (732794)
* crash when there is no smime backend, and the protocol can't be determined.(733049 )
* kolab/issue2151 Fix creation of new folders when restarting KMail before the next sync. ( 733149 )
-* kolab/issue2142 ( part 2 ) Provide a proper parent for the "ask to overwrite" dialog.(733495)
+* kolab/issue2142 ( part 2 ) Provide a proper tqparent for the "ask to overwrite" dialog.(733495)
* kolab/issue 2176 Move transaction code into the filtermanager, from the caller and make sure filter counts are written to and read from the right section. ( 733511 )
* kolab/issue2175 Show an error message if the to-be-imported filters file can't be read. (733519 )
-* kolab/issue2181 Fix crash when opening a message without a parent, cleanup initialization order.(734247)
+* kolab/issue2181 Fix crash when opening a message without a tqparent, cleanup initialization order.(734247)
New functionality
-------------------
@@ -2063,7 +2063,7 @@ Bugfixes
Korganizer
-----------
-- proko35 W1-9 icon alignment was improved.
+- proko35 W1-9 icon tqalignment was improved.
Additional Fixes
================
diff --git a/README.Kolab b/README.Kolab
index 46fc111b..455e5448 100644
--- a/README.Kolab
+++ b/README.Kolab
@@ -39,7 +39,7 @@ KAddressBook:
The scheme for the base DN is to take the parts of the fully
qualified hostname of the kolab server and put ",dc=" between
the parts and "dc=" in front of it. Or in Qt code:
- baseDN = "dc=" + hostname.replace( '.', ",dc=" );
+ baseDN = "dc=" + hostname.tqreplace( '.', ",dc=" );
Finally check the checkbox to activate the LDAP server. Now
you can search the Kolab LDAP server and get all users on the
system.
diff --git a/akregator/COPYING b/akregator/COPYING
index c13faf0d..2ad70b8b 100644
--- a/akregator/COPYING
+++ b/akregator/COPYING
@@ -59,7 +59,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 0. This License applies to any program or other work which contains
+ 0. This License applies to any program or other work which tqcontains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
diff --git a/akregator/HACKING b/akregator/HACKING
index 6e5c1b97..4567e4d4 100644
--- a/akregator/HACKING
+++ b/akregator/HACKING
@@ -66,7 +66,7 @@ Spaces
================================================================================
Spaces should be used between the conditional / loop type and the
-conditional statement. They should not be used after parenthesis. However
+conditional statement. They should not be used after tqparenthesis. However
the should be to mark of mathematical or comparative operators.
if ( foo == bar )
@@ -87,17 +87,17 @@ class should be roughly as follows:
public typedefs:
public ctors:
public methods:
-public slots:
-signals:
+public Q_SLOTS:
+Q_SIGNALS:
protected methods:
-protected slots:
+protected Q_SLOTS:
protected fields:
private methods:
-private slots:
+private Q_SLOTS:
private fields:
private ctors: // if you define ctors/dtor as private, put them at end
-If there are no private slots there is no need for two private sections, however
+If there are no private Q_SLOTS there is no need for two private sections, however
private functions and private variables should be clearly separated.
The implementations files -- .cpp files -- should follow (when possible) the
@@ -163,10 +163,10 @@ class Test : public QObject
static Test *instance() { return m_instance; }
- public slots:
+ public Q_SLOTS:
void receive(QSomething &);
- signals:
+ Q_SIGNALS:
void send(QSomething &);
protected:
@@ -174,7 +174,7 @@ class Test : public QObject
static void someProtectedStaticFunc();
- protected slots:
+ protected Q_SLOTS:
void protectedSlot();
protected:
@@ -185,7 +185,7 @@ class Test : public QObject
static int staticPrivateMethod();
- private slots:
+ private Q_SLOTS:
void privateSlotIndeed(int youWonder);
private:
diff --git a/akregator/src/aboutdata.cpp b/akregator/src/aboutdata.cpp
index a2a74754..438f81a6 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
diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h
index 56223d15..8f88079e 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 225f85d7..5598457a 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 17dae1fa..bcdba56b 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 18523993..bb4741ed 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
@@ -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 871edc94..398135c6 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 cc10844b..78a80103 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 fc38e617..1152f3d0 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 09c10fa4..5bdcfdc7 100644
--- a/akregator/src/addfeedwidgetbase.ui
+++ b/akregator/src/addfeedwidgetbase.ui
@@ -1,6 +1,6 @@
Akregator::AddFeedWidgetBase
-
+
AddFeedWidget
@@ -22,7 +22,7 @@
0
-
+
tqlayout16
@@ -30,7 +30,7 @@
unnamed
-
+
pixmapLabel1
@@ -63,7 +63,7 @@
-
+
tqlayout15
@@ -82,7 +82,7 @@
-
+
textLabel1
@@ -95,7 +95,7 @@
Add New Source
-
+
textLabel3
@@ -115,7 +115,7 @@
statusLabel
- Status
+ tqStatus
diff --git a/akregator/src/akregator_options.h b/akregator/src/akregator_options.h
index 2b4334ba..3d2c2005 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 aafb17be..2b0f73e7 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
#include
@@ -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.")
.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 487b001d..43404a17 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 5bb51075..28fed0d0 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 4b67113c..84fd6572 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
diff --git a/akregator/src/akregator_run.h b/akregator/src/akregator_run.h
index db257fed..35e80e4c 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 59457286..0d9b56af 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(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(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 (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::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::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::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 4b9dcd13..66796d42 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 09f631a0..c0151af3 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 4b4d480e..8d1baa2a 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 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 065a421a..e8e36f07 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 dee27da5..c39d72e8 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 c9df8963..68e41730 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 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 d38f9026..5dbc0804 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 d456a415..608e2a8d 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
@@ -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 0839c446..7d756262 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 5b61457b..a74bdf5c 100644
--- a/akregator/src/articleviewer.rc
+++ b/akregator/src/articleviewer.rc
@@ -11,7 +11,7 @@
-
+
" ), i18n( "Docking in System Tray" ), "hideOnCloseInfo");
+ KMessageBox::information(this, i18n( "Closing the main window will keep Akregator running in the system tray. Use 'Quit' from the 'File' menu to quit the application.
" ), i18n( "TQt::Docking in System Tray" ), "hideOnCloseInfo");
hide();
return false;
}
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index 84306282..e21e330f 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 a535197f..ec0fe7b6 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 df60b29c..d13f04de 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 categories(const TQString& guid=TQString::null);
+ virtual TQValueList 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 160c4bad..1729b493 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 21edd0fc..314c956b 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 88b7a39d..7124a29e 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 4f95fa51..eddbefb8 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 a6275cea..6ed1d5ab 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 3867d6b5..ed5a4573 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 8bf3dc8c..5dfc2573 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 49c45bce..aa23e739 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 6c68c5c3..fab47372 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 353d0517..7cf2efdf 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 75321f9c..10d45f3c 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 743f4757..65a9e94e 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 243eca04..9bc9b440 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 f43bc0e3..3a458337 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 11e384ee..af2fc9fa 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 79963d7b..8f3ed207 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 f317bcb2..b5611e57 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 ba6e9254..67530b7f 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 fce69720..788087f8 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 e697c21b..3fd71eba 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 c8960237..cfa37def 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -1,6 +1,6 @@
Akregator::Backend::MK4ConfWidgetBase
-
+
MK4ConfWidgetBase
@@ -25,7 +25,7 @@
unnamed
-
+
tqlayout4
@@ -33,7 +33,7 @@
unnamed
-
+
cbUseDefault
@@ -44,7 +44,7 @@
true
-
+
tqlayout3
@@ -52,7 +52,7 @@
unnamed
-
+
label
@@ -72,7 +72,7 @@
-
+
tqlayout4
@@ -97,7 +97,7 @@
-
+
buttonOk
@@ -114,7 +114,7 @@
true
-
+
buttonApply
@@ -125,7 +125,7 @@
true
-
+
buttonCancel
diff --git a/akregator/src/mk4storage/mk4plugin.cpp b/akregator/src/mk4storage/mk4plugin.cpp
index a475a226..b3493be3 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 b512a809..fc9935a1 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 09cacc9d..7a9cd065 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 85afb48e..799e72ac 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 8fd93c55..af71d97b 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 37e31764..aa0a92ee 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 fd49c060..edea9c6e 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 children = rootNode()->children();
+ TQValueList tqchildren = rootNode()->tqchildren();
- for (TQValueList::ConstIterator it = children.begin(); it != children.end(); ++it)
+ for (TQValueList::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 b65078cc..3d628ec7 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 b505b2b8..6220e97c 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
diff --git a/akregator/src/notificationmanager.h b/akregator/src/notificationmanager.h
index 9a543034..96d898a0 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 90bf6008..64169225 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 a07fd2a9..2fb3a155 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 dd44ee36..a7b98fee 100644
--- a/akregator/src/pageviewer.rc
+++ b/akregator/src/pageviewer.rc
@@ -17,7 +17,7 @@
-
+
diff --git a/akregator/src/plugin.cpp b/akregator/src/plugin.cpp
index 9b413f5c..599d3972 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 650a4a92..2d615ccb 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 83e746f8..d12016d4 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 ca97753f..3121bbc0 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 6535896b..6ef94f4c 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
@@ -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 c348becc..5b31bbf2 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 28ee7858..658051f9 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 f6f85376..0c854c36 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 3e94c7ed..038d1b26 100644
--- a/akregator/src/propertieswidgetbase.ui
+++ b/akregator/src/propertieswidgetbase.ui
@@ -1,6 +1,6 @@
Akregator::FeedPropertiesWidgetBase
-
+
FeedPropertiesWidget
@@ -22,11 +22,11 @@
0
-
+
tabWidget2
-
+
tab
@@ -37,7 +37,7 @@
unnamed
-
+
tqlayout8
@@ -45,7 +45,7 @@
unnamed
-
+
textLabel3
@@ -56,7 +56,7 @@
urlEdit
-
+
textLabel2
@@ -90,7 +90,7 @@
-
+
upChkbox
@@ -98,7 +98,7 @@
U&se a custom update interval
-
+
tqlayout9
@@ -123,7 +123,7 @@
-
+
textLabel1
@@ -154,7 +154,7 @@
1
-
+
-
Minutes
@@ -184,7 +184,7 @@
-
+
checkBox_useNotification
@@ -194,7 +194,7 @@
-
+
tab
@@ -205,7 +205,7 @@
unnamed
-
+
bg_feedArchive
@@ -225,7 +225,7 @@
0
-
+
rb_keepAllArticles
@@ -233,7 +233,7 @@
&Keep all articles
-
+
rb_limitArticleNumber
@@ -241,7 +241,7 @@
Limit archi&ve to:
-
+
rb_limitArticleAge
@@ -326,7 +326,7 @@
1
-
+
rb_disableArchiving
@@ -334,7 +334,7 @@
Di&sable archiving
-
+
rb_globalDefault
@@ -349,7 +349,7 @@
-
+
TabPage
@@ -360,7 +360,7 @@
unnamed
-
+
tqlayout4
@@ -368,7 +368,7 @@
unnamed
-
+
checkBox_loadWebsite
@@ -376,7 +376,7 @@
Load the &full website when reading articles
-
+
checkBox_markRead
@@ -452,10 +452,10 @@
setEnabled(bool)
-
+
slotUpdateComboBoxActivated( int )
slotUpdateCheckBoxToggled( bool )
-
+
klineedit.h
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index f2dd33e7..abb319af 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 8227f83f..18cb5d07 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 7a849ff9..0aea7367 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 2bca6614..2186645d 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 3cb48868..b80b85a4 100644
--- a/akregator/src/settings_advancedbase.ui
+++ b/akregator/src/settings_advancedbase.ui
@@ -1,7 +1,7 @@
Akregator::SettingsAdvancedBase
Frank Osterfeld
-
+
SettingsAdvanced
@@ -20,7 +20,7 @@
unnamed
-
+
groupBox3_3_2
@@ -31,7 +31,7 @@
unnamed
-
+
textLabel1
@@ -44,7 +44,7 @@
cbBackend
-
+
pbBackendConfigure
@@ -54,7 +54,7 @@
-
+
groupBox3_3
@@ -65,7 +65,7 @@
unnamed
-
+
kcfg_MarkReadDelay
@@ -96,7 +96,7 @@
-
+
kcfg_ResetQuickFilterOnNodeChange
@@ -110,7 +110,7 @@
false
-
+
kcfg_UseMarkReadDelay
diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui
index 2f40bcd5..242d61cb 100644
--- a/akregator/src/settings_appearance.ui
+++ b/akregator/src/settings_appearance.ui
@@ -1,7 +1,7 @@
Akregator::SettingsAppearance
Frank Osterfeld
-
+
SettingsAppearance
@@ -23,7 +23,7 @@
0
-
+
groupBox3
@@ -34,7 +34,7 @@
unnamed
-
+
lbl_MinimumFontSize
@@ -42,7 +42,7 @@
Minimum font size:
-
+
slider_minimumFontSize
@@ -73,7 +73,7 @@
8
-
+
lbl_MediumFontSize
@@ -81,7 +81,7 @@
Medium font size:
-
+
slider_mediumFontSize
@@ -114,7 +114,7 @@
-
+
FontsGroupBox
@@ -125,7 +125,7 @@
unnamed
-
+
textLabel1
@@ -138,7 +138,7 @@
kcfg_StandardFont
-
+
textLabel2_2
@@ -151,7 +151,7 @@
kcfg_FixedFont
-
+
textLabel3
@@ -164,7 +164,7 @@
kcfg_SerifFont
-
+
textLabel4
@@ -179,7 +179,7 @@
-
+
kcfg_UnderlineLinks
diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui
index 86e0a303..fbfcea0c 100644
--- a/akregator/src/settings_archive.ui
+++ b/akregator/src/settings_archive.ui
@@ -1,7 +1,7 @@
Akregator::SettingsArchive
Frank Osterfeld
-
+
SettingsArchive
@@ -23,7 +23,7 @@
0
-
+
tqlayout1
@@ -31,7 +31,7 @@
unnamed
-
+
kcfg_ArchiveMode
@@ -42,7 +42,7 @@
unnamed
-
+
rb_KeepAllArticles
@@ -50,7 +50,7 @@
Keep all articles
-
+
rb_LimitArticleNumber
@@ -58,7 +58,7 @@
Limit feed archive size to:
-
+
rb_LimitArticleAge
@@ -66,7 +66,7 @@
Delete articles older than:
-
+
rb_DisableArchiving
@@ -125,7 +125,7 @@
-
+
kcfg_DoNotExpireImportantArticles
diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui
index af9798e3..4318f4cc 100644
--- a/akregator/src/settings_browser.ui
+++ b/akregator/src/settings_browser.ui
@@ -1,7 +1,7 @@
Akregator::SettingsBrowser
Gary Cramblitt
-
+
SettingsBrowser
@@ -23,7 +23,7 @@
0
-
+
buttonGroup1
@@ -37,7 +37,7 @@
unnamed
-
+
kcfg_ExternalBrowserUseKdeDefault
@@ -48,7 +48,7 @@
true
-
+
kcfg_ExternalBrowserUseCustomCommand
@@ -56,7 +56,7 @@
Use this command:
-
+
kcfg_ExternalBrowserCustomCommand
@@ -69,7 +69,7 @@
-
+
kcfg_CloseButtonOnTabs
@@ -94,7 +94,7 @@
-
+
tqlayout2
@@ -102,7 +102,7 @@
unnamed
-
+
-
Open in Tab
@@ -130,7 +130,7 @@
-
+
textLabel1
@@ -146,7 +146,7 @@
Middle mouse click:
-
+
textLabel1_3
@@ -162,7 +162,7 @@
Left mouse click:
-
+
-
Open in Tab
diff --git a/akregator/src/settings_general.ui b/akregator/src/settings_general.ui
index 26ef9299..27af880a 100644
--- a/akregator/src/settings_general.ui
+++ b/akregator/src/settings_general.ui
@@ -1,7 +1,7 @@
Akregator::SettingsGeneral
Teemu Rytilahti
-
+
SettingsGeneral
@@ -23,7 +23,7 @@
0
-
+
groupBox3_2
@@ -34,7 +34,7 @@
unnamed
-
+
kcfg_UseIntervalFetch
@@ -42,7 +42,7 @@
&Use interval fetching
-
+
kcfg_UseNotifications
@@ -56,7 +56,7 @@
Select this if you want to get notified when there are new articles.
-
+
kcfg_ShowTrayIcon
@@ -64,7 +64,7 @@
Show tra&y icon
-
+
textLabel1
@@ -75,7 +75,7 @@
Fetch feeds every:
-
+
kcfg_AutoFetchInterval
@@ -100,7 +100,7 @@
-
+
groupBox3
@@ -111,7 +111,7 @@
unnamed
-
+
kcfg_MarkAllFeedsReadOnStartup
@@ -119,7 +119,7 @@
Mark &all feeds as read on startup
-
+
kcfg_FetchOnStartup
@@ -146,7 +146,7 @@
-
+
groupBox3_3
@@ -157,7 +157,7 @@
unnamed
-
+
kcfg_UseHTMLCache
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index cd991a49..57612bd4 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 children = node->children();
+ TQValueList tqchildren = node->tqchildren();
m_view->d->nodeToItem[node]->setExpandable(true);
- for (TQValueList::ConstIterator it = children.begin(); it != children.end(); ++it)
+ for (TQValueList::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 ba9ddda2..97e87fda 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 6263c11f..b0fc92c9 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 8a564cd8..5172130b 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 b2fbf895..09d4d396 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 2c6a9ceb..1899cd14 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 43b8788d..e8d5c4c0 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 35cbdda4..05961ffc 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 12f18a0b..93ab7f75 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 70f5a956..45f9fc0a 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 0e8d2d44..bc1a2d43 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 f6162ef9..608c05b1 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 64567840..d47c42c8 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 3f86fa1d..7ae02ba9 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 b4e3722f..bd357ad0 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 12cc7a7f..f42724b3 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 a865b6ec..d215eb8f 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 20a68eb4..75ce305e 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 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 7225f2ce..f8760639 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 cc958307..bb361fce 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 6e416e54..1c883ff0 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 920827af..fe57de4a 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 ac339aec..6cdefa3d 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 3b4939cd..35c72072 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::Iterator en = d->articles.end();
for (TQValueList::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 30630f86..8598a8a2 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 articles(const TQString& tag=TQString::null);
+ virtual TQValueList 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 265ec5f7..ec083145 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 f9ef1b1b..f5ea5edf 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 f1a98b62..ba531d03 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(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(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(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 9e67b197..02d1bf8b 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 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 ea4848c4..f14b7494 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
@@ -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 503b6f0e..3665bbe4 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 d96744bb..7109b061 100644
--- a/akregator/src/tagpropertieswidgetbase.ui
+++ b/akregator/src/tagpropertieswidgetbase.ui
@@ -1,7 +1,7 @@
TagPropertiesWidgetBase
Frank Osterfeld
-
+
Form1
@@ -20,7 +20,7 @@
0
-
+
tqlayout1
@@ -28,7 +28,7 @@
unnamed
-
+
textLabel1
@@ -36,7 +36,7 @@
Title:
-
+
le_title
@@ -60,7 +60,7 @@
-
+
tqlayout9
@@ -68,7 +68,7 @@
unnamed
-
+
textLabel1_2
diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp
index 4cfb787a..1be7f952 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 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 febb47d3..637fce50 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 680f88ca..963e6029 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(parent());
+ TQWidget *p=static_cast(tqparent());
KWin::forceActiveWindow(p->winId());
}
diff --git a/akregator/src/trayicon.h b/akregator/src/trayicon.h
index ac742ae6..316d938b 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 5aa31686..58e4ae8e 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 children = d->parent->children();
+ TQValueList 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 children = d->parent->children();
+ TQValueList 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 366677d3..d6c6f860 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 articles(const TQString& tag=TQString::null) = 0;
+ virtual TQValueList 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 02361f37..a5955a9f 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(KListViewItem::nextSibling());
}
-FolderItem* TreeNodeItem::parent() const
+FolderItem* TreeNodeItem::tqparent() const
{
- return static_cast(KListViewItem::parent());
+ return static_cast(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 b4bae964..3b263d73 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 b35d3113..375fd379 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 5b3149b3..b7affcf2 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 eb555a75..fb7b0186 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 7a65915b..4a6e05ec 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 6926a151..2c52cf43 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
@@ -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 95924e82..c6e2c443 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();
diff --git a/certmanager/aboutdata.cpp b/certmanager/aboutdata.cpp
index fb5813ec..6e1ac8f2 100644
--- a/certmanager/aboutdata.cpp
+++ b/certmanager/aboutdata.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/certmanager/aboutdata.h b/certmanager/aboutdata.h
index 29e516f5..ca96f684 100644
--- a/certmanager/aboutdata.h
+++ b/certmanager/aboutdata.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/certmanager/certificateinfowidget.ui b/certmanager/certificateinfowidget.ui
index f907e37d..54f5a358 100644
--- a/certmanager/certificateinfowidget.ui
+++ b/certmanager/certificateinfowidget.ui
@@ -1,6 +1,6 @@
CertificateInfoWidget
-
+
CertificateInfoWidget
@@ -22,7 +22,7 @@
unnamed
-
+
Frame3
@@ -33,11 +33,11 @@
Sunken
-
+
tabWidget
-
+
tab
@@ -51,7 +51,7 @@
6
-
+
Description
@@ -84,7 +84,7 @@
false
-
+
textView
@@ -97,7 +97,7 @@
-
+
tab
@@ -111,7 +111,7 @@
6
-
+
Path
@@ -132,7 +132,7 @@
-
+
dump
@@ -146,7 +146,7 @@
6
-
+
dumpView
@@ -163,7 +163,7 @@
-
+
importButton
@@ -188,7 +188,7 @@
-
+
TextLabel1
diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp
index 4932b6bd..8ce43aa5 100644
--- a/certmanager/certificateinfowidgetimpl.cpp
+++ b/certmanager/certificateinfowidgetimpl.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -54,7 +54,7 @@
#include
#include
-// Qt
+// TQt
#include
#include
#include
@@ -69,8 +69,8 @@
#include
CertificateInfoWidgetImpl::CertificateInfoWidgetImpl( const GpgME::Key & key, bool external,
- TQWidget * parent, const char * name )
- : CertificateInfoWidget( parent, name ),
+ TQWidget * tqparent, const char * name )
+ : CertificateInfoWidget( tqparent, name ),
mExternal( external ),
mFoundIssuer( true ),
mHaveKeyLocally( false )
@@ -182,14 +182,14 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key ) {
startCertificateDump();
}
-static void showChainListError( TQWidget * parent, const GpgME::Error & err, const char * subject ) {
+static void showChainListError( TQWidget * tqparent, const GpgME::Error & err, const char * subject ) {
assert( err );
const TQString msg = i18n("An error occurred while fetching "
"the certificate %1 from the backend:
"
"%2
")
- .arg( subject ? TQString::fromUtf8( subject ) : TQString::null,
+ .arg( subject ? TQString::fromUtf8( subject ) : TQString(),
TQString::fromLocal8Bit( err.asString() ) );
- KMessageBox::error( parent, msg, i18n("Certificate Listing Failed" ) );
+ KMessageBox::error( tqparent, msg, i18n("Certificate Listing Failed" ) );
}
void CertificateInfoWidgetImpl::startCertificateChainListing() {
@@ -329,7 +329,7 @@ void CertificateInfoWidgetImpl::updateChainView() {
else {
item = new TQListViewItem( pathView, i18n("Issuer certificate not found ( %1)")
.arg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
- item->setOpen( true ); // Qt bug: doesn't open after setEnabled( false ) :/
+ item->setOpen( true ); // TQt bug: doesn't open after setEnabled( false ) :/
item->setEnabled( false );
}
item->setOpen( true );
@@ -358,7 +358,7 @@ void CertificateInfoWidgetImpl::slotShowCertPathDetails( TQListViewItem * item )
// find the key corresponding to "item". This hack would not be
// necessary if pathView was a Kleo::KeyListView, but it's
- // Qt-Designer-generated and I don't feel like creating a custom
+ // TQt-Designer-generated and I don't feel like creating a custom
// widget spec for Kleo::KeyListView.
unsigned int totalCount = 0;
int itemIndex = -1;
diff --git a/certmanager/certificateinfowidgetimpl.h b/certmanager/certificateinfowidgetimpl.h
index 53950e3b..d7e2f315 100644
--- a/certmanager/certificateinfowidgetimpl.h
+++ b/certmanager/certificateinfowidgetimpl.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -48,9 +48,10 @@ namespace GpgME {
class CertificateInfoWidgetImpl : public CertificateInfoWidget {
Q_OBJECT
+ TQ_OBJECT
public:
CertificateInfoWidgetImpl( const GpgME::Key & key, bool external,
- TQWidget * parent=0, const char * name=0);
+ TQWidget * tqparent=0, const char * name=0);
void setKey( const GpgME::Key & key );
diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui
index 3cf42adb..11bb1aa8 100644
--- a/certmanager/certificatewizard.ui
+++ b/certmanager/certificatewizard.ui
@@ -1,6 +1,6 @@
CertificateWizard
-
+
CertificateWizard
@@ -21,7 +21,7 @@
1
-
+
introPage
@@ -32,7 +32,7 @@
unnamed
-
+
TextLabel1
@@ -64,7 +64,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
-
+
WizardPage
@@ -75,7 +75,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
unnamed
-
+
TextLabel2_2
@@ -103,7 +103,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
-
+
groupBox1
@@ -114,7 +114,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
unnamed
-
+
textLabel1
@@ -125,7 +125,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
keyLengthCB
-
+
keyLengthCB
@@ -149,7 +149,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
-
+
certTypeBG
@@ -160,7 +160,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
unnamed
-
+
signOnlyCB
@@ -168,7 +168,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
For &signing only
-
+
encryptOnlyCB
@@ -176,7 +176,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
For &encrypting only
-
+
bothCB
@@ -208,7 +208,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
-
+
personalDataPage
@@ -219,7 +219,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
unnamed
-
+
TextLabel2
@@ -247,7 +247,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
-
+
insertAddressButton
@@ -275,7 +275,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
-
+
edContainer
@@ -296,7 +296,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
-
+
generatePage
@@ -307,7 +307,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
unnamed
-
+
TextLabel4
@@ -343,7 +343,7 @@ there.</p><qt>
-
+
ButtonGroup7
@@ -373,7 +373,7 @@ there.</p><qt>
storeUR
-
+
storeInFileRB
@@ -381,7 +381,7 @@ there.</p><qt>
&Store in a file:
-
+
sendToCARB
@@ -392,12 +392,12 @@ there.</p><qt>
true
-
+
caEmailED
-
+
brokenCA
@@ -407,7 +407,7 @@ there.</p><qt>
-
+
generatePB
@@ -457,7 +457,7 @@ there.</p><qt>
-
+
finishPage
@@ -474,7 +474,7 @@ there.</p><qt>
6
-
+
TextLabel7
@@ -489,7 +489,7 @@ If you want to change anything, press Back and make your changes; otherwise, pre
WordBreak|AlignVCenter
-
+
certificateTE
@@ -546,10 +546,10 @@ If you want to change anything, press Back and make your changes; otherwise, pre
certificateTE
generatePB
-
+
slotEmailAddressChanged(const QString&)
slotGenerateCertificate()
-
+
klineedit.h
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index 7127b3c2..3c618e73 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -63,7 +63,7 @@
#include
#include
-// Qt
+// TQt
#include
#include
#include
@@ -83,7 +83,7 @@ static const unsigned int numKeyLengths = sizeof keyLengths / sizeof *keyLengths
static TQString attributeLabel( const TQString & attr, bool required ) {
if ( attr.isEmpty() )
- return TQString::null;
+ return TQString();
const TQString label = Kleo::DNAttributeMapper::instance()->name2label( attr );
if ( !label.isEmpty() )
if ( required )
@@ -108,14 +108,14 @@ static bool availForMod( const TQLineEdit * le ) {
}
/*
- * Constructs a CertificateWizardImpl which is a child of 'parent', with the
+ * Constructs a CertificateWizardImpl which is a child of 'tqparent', with the
* name 'name' and widget flags set to 'f'
*
* The wizard will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal wizard.
*/
-CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* name, bool modal, WFlags fl )
- : CertificateWizard( parent, name, modal, fl )
+CertificateWizardImpl::CertificateWizardImpl( TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+ : CertificateWizard( tqparent, name, modal, fl )
{
// don't allow to go to last page until a key has been generated
setNextEnabled( generatePage, false );
@@ -176,7 +176,7 @@ void CertificateWizardImpl::slotEnablePersonalDataPageExit() {
*/
CertificateWizardImpl::~CertificateWizardImpl()
{
- // no need to delete child widgets, Qt does it all for us
+ // no need to delete child widgets, TQt does it all for us
}
static const char * oidForAttributeName( const TQString & attr ) {
@@ -429,8 +429,8 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
TQString error;
TQCString dcopService;
int result = KDCOPServiceStarter::self()->
- tqfindServiceFor( "DCOP/Mailer", TQString::null,
- TQString::null, &error, &dcopService );
+ findServiceFor( "DCOP/Mailer", TQString(),
+ TQString(), &error, &dcopService );
if ( result != 0 ) {
kdDebug() << "Couldn't connect to KMail\n";
KMessageBox::error( this,
@@ -441,11 +441,11 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
TQCString dummy;
// OK, so kmail (or kontact) is running. Now ensure the object we want is available.
// [that's not the case when kontact was already running, but kmail not loaded into it... in theory.]
- if ( !kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+ if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper
DCOPReply reply = ref.call( "load()" );
if ( reply.isValid() && (bool)reply ) {
- Q_ASSERT( kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+ Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
} else
kdWarning() << "Error loading " << dcopService << endl;
}
diff --git a/certmanager/certificatewizardimpl.h b/certmanager/certificatewizardimpl.h
index 98327e81..18aa5f68 100644
--- a/certmanager/certificatewizardimpl.h
+++ b/certmanager/certificatewizardimpl.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -49,16 +49,17 @@ namespace KIO {
class CertificateWizardImpl : public CertificateWizard
{
Q_OBJECT
+ TQ_OBJECT
public:
- CertificateWizardImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ CertificateWizardImpl( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~CertificateWizardImpl();
bool sendToCA() const;
TQString caEMailAddress() const;
KURL saveFileUrl() const;
- typedef QPair StringLEPair;
+ typedef TQPair StringLEPair;
typedef TQValueVector< StringLEPair > AttrPairList;
public:
diff --git a/certmanager/certlistview.cpp b/certmanager/certlistview.cpp
index f26ba17f..73f3ecdd 100644
--- a/certmanager/certlistview.cpp
+++ b/certmanager/certlistview.cpp
@@ -5,8 +5,8 @@
CertKeyListView::CertKeyListView( const ColumnStrategy * strategy,
const DisplayStrategy * display,
- TQWidget * parent, const char * name, WFlags f )
- : Kleo::KeyListView( strategy, display, parent, name, f )
+ TQWidget * tqparent, const char * name, WFlags f )
+ : Kleo::KeyListView( strategy, display, tqparent, name, f )
{
viewport()->setAcceptDrops( true );
}
diff --git a/certmanager/certlistview.h b/certmanager/certlistview.h
index d06caf99..3434fc47 100644
--- a/certmanager/certlistview.h
+++ b/certmanager/certlistview.h
@@ -7,11 +7,12 @@
/// We need to derive from Kleo::KeyListView simply to add support for drop events
class CertKeyListView : public Kleo::KeyListView {
Q_OBJECT
+ TQ_OBJECT
public:
CertKeyListView( const ColumnStrategy * strategy,
const DisplayStrategy * display=0,
- TQWidget * parent=0, const char * name=0, WFlags f=0 );
+ TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
signals:
void dropped( const KURL::List& urls );
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index aebfa366..59fc7376 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -89,7 +89,7 @@
#include
#include
-// Qt
+// TQt
#include
#include
@@ -136,7 +136,7 @@ namespace {
case 0: return i18n("Subject");
case 1: return i18n("Issuer");
case 2: return i18n("Serial");
- default: return TQString::null;
+ default: return TQString();
}
}
@@ -144,8 +144,8 @@ namespace {
switch ( col ) {
case 0: return Kleo::DN( key.userID(0).id() ).prettyDN();
case 1: return Kleo::DN( key.issuerName() ).prettyDN();
- case 2: return key.issuerSerial() ? TQString::fromUtf8( key.issuerSerial() ) : TQString::null ;
- default: return TQString::null;
+ case 2: return key.issuerSerial() ? TQString::fromUtf8( key.issuerSerial() ) : TQString() ;
+ default: return TQString();
}
}
@@ -161,8 +161,8 @@ namespace {
} // anon namespace
CertManager::CertManager( bool remote, const TQString& query, const TQString & import,
- TQWidget* parent, const char* name, WFlags f )
- : KMainWindow( parent, name, f|WDestructiveClose ),
+ TQWidget* tqparent, const char* name, WFlags f )
+ : KMainWindow( tqparent, name, f|WDestructiveClose ),
mCrlView( 0 ),
mDirmngrProc( 0 ),
mHierarchyAnalyser( 0 ),
@@ -354,7 +354,7 @@ void CertManager::createActions() {
(void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" );
- mLineEditAction = new LineEditAction( TQString::null, actionCollection(), this,
+ mLineEditAction = new LineEditAction( TQString(), actionCollection(), this,
TQT_SLOT(slotSearch()),
"query_lineedit_action");
@@ -363,8 +363,8 @@ void CertManager::createActions() {
mComboAction = new ComboAction( lst, actionCollection(), this, TQT_SLOT( slotToggleRemote(int) ),
"location_combo_action", mNextFindRemote? 1 : 0 );
- mFindAction = new KAction( i18n("Find"), "find", 0, this, TQT_SLOT(slotSearch()),
- actionCollection(), "find" );
+ mFindAction = new KAction( i18n("Find"), "tqfind", 0, this, TQT_SLOT(slotSearch()),
+ actionCollection(), "tqfind" );
KStdAction::keyBindings( this, TQT_SLOT(slotEditKeybindings()), actionCollection() );
KStdAction::preferences( this, TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
@@ -496,10 +496,10 @@ static std::set extractKeyFingerprints( const TQPtrList & set ) {
- // ARGH. This is madness. Shitty Qt containers don't support TQStringList( patterns.begin(), patterns.end() ) :/
+ // ARGH. This is madness. Shitty TQt containers don't support TQStringList( patterns.begin(), patterns.end() ) :/
TQStringList sl;
for ( std::set::const_iterator it = set.begin() ; it != set.end() ; ++it )
- // let's make extra sure, maybe someone tries to make Qt not support std::string->TQString conversion
+ // let's make extra sure, maybe someone tries to make TQt not support std::string->TQString conversion
sl.push_back( TQString::tqfromLatin1( it->c_str() ) );
return sl;
}
@@ -527,14 +527,14 @@ void CertManager::slotRefreshKeysResult( const GpgME::Error & err ) {
i18n("Refreshing Keys Failed") );
}
-static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
+static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) {
assert( err );
const TQString msg = i18n( "An error occurred while fetching "
"the certificates from the backend:
"
"%1
" )
.arg( TQString::fromLocal8Bit( err.asString() ) );
- KMessageBox::error( parent, msg, i18n( "Certificate Listing Failed" ) );
+ KMessageBox::error( tqparent, msg, i18n( "Certificate Listing Failed" ) );
}
void CertManager::slotSearch() {
@@ -592,7 +592,7 @@ static void selectKeys( Kleo::KeyListView * lv, const std::set & fp
for ( TQListViewItemIterator it( lv ) ; it.current() ; ++it )
if ( Kleo::KeyListViewItem * item = Kleo::lvi_cast( it.current() ) ) {
const char * fpr = item->key().primaryFingerprint();
- item->setSelected( fpr && fprs.find( fpr ) != fprs.end() );
+ item->setSelected( fpr && fprs.tqfind( fpr ) != fprs.end() );
}
}
@@ -668,7 +668,7 @@ void CertManager::slotImportCertFromFile()
{
const TQString filter = "application/x-x509-ca-cert application/x-pkcs12 application/pkcs7-mime";
//const TQString filter = TQString("*.pem *.der *.p7c *.p12|") + i18n("Certificates (*.pem *.der *.p7c *.p12)");
- slotImportCertFromFile( KFileDialog::getOpenURL( TQString::null, filter, this,
+ slotImportCertFromFile( KFileDialog::getOpenURL( TQString(), filter, this,
i18n( "Select Certificate File" ) ) );
}
@@ -700,7 +700,7 @@ void CertManager::slotImportResult( KIO::Job* job )
updateImportActions( true );
}
-static void showCertificateDownloadError( TQWidget * parent, const GpgME::Error & err, const TQString& certDisplayName ) {
+static void showCertificateDownloadError( TQWidget * tqparent, const GpgME::Error & err, const TQString& certDisplayName ) {
assert( err );
const TQString msg = i18n( "An error occurred while trying "
"to download the certificate %1:
"
@@ -708,7 +708,7 @@ static void showCertificateDownloadError( TQWidget * parent, const GpgME::Error
.arg( certDisplayName )
.arg( TQString::fromLocal8Bit( err.asString() ) );
- KMessageBox::error( parent, msg, i18n( "Certificate Download Failed" ) );
+ KMessageBox::error( tqparent, msg, i18n( "Certificate Download Failed" ) );
}
void CertManager::slotDownloadCertificate() {
@@ -745,7 +745,7 @@ void CertManager::slotStartCertificateDownload( const TQString& fingerprint, con
TQString CertManager::displayNameForJob( const Kleo::Job *job )
{
- JobsDisplayNameMap::iterator it = mJobsDisplayNameMap.find( job );
+ JobsDisplayNameMap::iterator it = mJobsDisplayNameMap.tqfind( job );
TQString displayName;
if ( it != mJobsDisplayNameMap.end() ) {
displayName = *it;
@@ -768,14 +768,14 @@ void CertManager::slotCertificateDownloadResult( const GpgME::Error & err, const
disconnectJobFromStatusBarProgress( err );
}
-static void showCertificateImportError( TQWidget * parent, const GpgME::Error & err, const TQString& certDisplayName ) {
+static void showCertificateImportError( TQWidget * tqparent, const GpgME::Error & err, const TQString& certDisplayName ) {
assert( err );
const TQString msg = i18n( "An error occurred while trying "
"to import the certificate %1:
"
"%2
" )
.arg( certDisplayName )
.arg( TQString::fromLocal8Bit( err.asString() ) );
- KMessageBox::error( parent, msg, i18n( "Certificate Import Failed" ) );
+ KMessageBox::error( tqparent, msg, i18n( "Certificate Import Failed" ) );
}
void CertManager::startCertificateImport( const TQByteArray & keyData, const TQString& certDisplayName ) {
@@ -853,7 +853,7 @@ void CertManager::slotCertificateImportResult( const GpgME::ImportResult & res )
KMessageBox::information( this,
i18n( "Detailed results of importing %1:
"
"" )
- .arg( displayName ).arg( lines.join( TQString::null ) ),
+ .arg( displayName ).arg( lines.join( TQString() ) ),
i18n( "Certificate Import Result" ) );
disconnectJobFromStatusBarProgress( res.error() );
@@ -891,7 +891,7 @@ void CertManager::slotDirmngrExited() {
void CertManager::importCRLFromFile() {
// loadcrl can only work with DER encoded files (verified with dirmngr 1.0.3)
TQString filter = TQString("*.crl *.arl *-crl.der *-arl.der|") + i18n("Certificate Revocation List, DER encoded (*.crl *.arl *-crl.der *-arl.der)");
- KURL url = KFileDialog::getOpenURL( TQString::null,
+ KURL url = KFileDialog::getOpenURL( TQString(),
filter,
this,
i18n( "Select CRL File" ) );
@@ -929,7 +929,7 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces
assert( slot );
assert( processname );
assert( mDirmngrProc );
- mErrorbuffer = TQString::null;
+ mErrorbuffer = TQString();
connect( mDirmngrProc, TQT_SIGNAL(processExited(KProcess*)), slot );
connect( mDirmngrProc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int) ),
this, TQT_SLOT(slotStderr(KProcess*,char*,int)) );
@@ -944,7 +944,7 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces
void CertManager::startImportCRL( const TQString& filename, bool isTempFile )
{
assert( !mDirmngrProc );
- mImportCRLTempFile = isTempFile ? filename : TQString::null;
+ mImportCRLTempFile = isTempFile ? filename : TQString();
mDirmngrProc = new KProcess();
*mDirmngrProc << "gpgsm" << "--call-dirmngr" << "loadcrl" << filename;
if ( !connectAndStartDirmngr( TQT_SLOT(slotDirmngrExited()), "gpgsm" ) ) {
@@ -998,13 +998,13 @@ void CertManager::slotClearCRLsResult() {
delete mDirmngrProc; mDirmngrProc = 0;
}
-static void showDeleteError( TQWidget * parent, const GpgME::Error & err ) {
+static void showDeleteError( TQWidget * tqparent, const GpgME::Error & err ) {
assert( err );
const TQString msg = i18n("An error occurred while trying to delete "
"the certificates:
"
"%1
")
.arg( TQString::fromLocal8Bit( err.asString() ) );
- KMessageBox::error( parent, msg, i18n("Certificate Deletion Failed") );
+ KMessageBox::error( tqparent, msg, i18n("Certificate Deletion Failed") );
}
static bool ByFingerprint( const GpgME::Key & left, const GpgME::Key & right ) {
@@ -1201,13 +1201,13 @@ void CertManager::slotExportCertificate() {
startCertificateExport( fingerprints );
}
-static void showCertificateExportError( TQWidget * parent, const GpgME::Error & err ) {
+static void showCertificateExportError( TQWidget * tqparent, const GpgME::Error & err ) {
assert( err );
const TQString msg = i18n("An error occurred while trying to export "
"the certificate:
"
"%1
")
.arg( TQString::fromLocal8Bit( err.asString() ) );
- KMessageBox::error( parent, msg, i18n("Certificate Export Failed") );
+ KMessageBox::error( tqparent, msg, i18n("Certificate Export Failed") );
}
void CertManager::startCertificateExport( const TQStringList & fingerprints ) {
@@ -1258,7 +1258,7 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T
kdDebug() << "CertManager::slotCertificateExportResult(): got " << data.size() << " bytes" << endl;
const TQString filter = TQString("*.pem|") + i18n("ASCII Armored Certificate Bundles (*.pem)");
- const KURL url = KFileDialog::getOpenURL( TQString::null,
+ const KURL url = KFileDialog::getOpenURL( TQString(),
filter,
this,
i18n( "Save Certificate" ) );
@@ -1296,13 +1296,13 @@ void CertManager::slotExportSecretKey() {
startSecretKeyExport( dlg.fingerprint() );
}
-static void showSecretKeyExportError( TQWidget * parent, const GpgME::Error & err ) {
+static void showSecretKeyExportError( TQWidget * tqparent, const GpgME::Error & err ) {
assert( err );
const TQString msg = i18n("An error occurred while trying to export "
"the secret key:
"
"%1
")
.arg( TQString::fromLocal8Bit( err.asString() ) );
- KMessageBox::error( parent, msg, i18n("Secret-Key Export Failed") );
+ KMessageBox::error( tqparent, msg, i18n("Secret-Key Export Failed") );
}
void CertManager::startSecretKeyExport( const TQString & fingerprint ) {
@@ -1377,7 +1377,7 @@ void CertManager::slotSecretKeyExportResult( const GpgME::Error & err, const TQB
kdDebug() << "CertManager::slotSecretKeyExportResult(): got " << data.size() << " bytes" << endl;
TQString filter = TQString("*.p12|") + i18n("PKCS#12 Key Bundle (*.p12)");
- KURL url = KFileDialog::getOpenURL( TQString::null,
+ KURL url = KFileDialog::getOpenURL( TQString(),
filter,
this,
i18n( "Save Certificate" ) );
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index bee15704..ef27db6e 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -78,10 +78,11 @@ namespace GpgME {
class KDE_EXPORT CertManager : public KMainWindow {
Q_OBJECT
+ TQ_OBJECT
public:
- CertManager( bool remote = false, const TQString& query = TQString::null,
- const TQString& import=TQString::null,
- TQWidget * parent=0, const char * name=0, WFlags f=0 );
+ CertManager( bool remote = false, const TQString& query = TQString(),
+ const TQString& import=TQString(),
+ TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
~CertManager();
bool isRemote() const { return mRemote; }
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index e0893233..90720508 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -38,8 +38,8 @@
#include
-AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
- : KCModule( parent, name )
+AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * tqparent, const char * name )
+ : KCModule( tqparent, name )
{
TQVBoxLayout* lay = new TQVBoxLayout( this );
mWidget = new Kleo::AppearanceConfigWidget( this );
@@ -70,10 +70,10 @@ void AppearanceConfigurationPage::defaults()
extern "C"
{
- KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *tqparent, const char * )
{
AppearanceConfigurationPage *page =
- new AppearanceConfigurationPage( parent, "kleopatra_config_appear" );
+ new AppearanceConfigurationPage( tqparent, "kleopatra_config_appear" );
return page;
}
}
diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h
index 4713e262..90c6bc13 100644
--- a/certmanager/conf/appearanceconfigpage.h
+++ b/certmanager/conf/appearanceconfigpage.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -43,8 +43,9 @@ namespace Kleo {
*/
class AppearanceConfigurationPage : public KCModule {
Q_OBJECT
+ TQ_OBJECT
public:
- AppearanceConfigurationPage( TQWidget * parent=0, const char * name=0 );
+ AppearanceConfigurationPage( TQWidget * tqparent=0, const char * name=0 );
virtual void load();
virtual void save();
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 77a97bb4..33f4189b 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -63,7 +63,7 @@
using namespace Kleo;
-class CategoryListViewItem : public QListViewItem
+class CategoryListViewItem : public TQListViewItem
{
public:
CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const KConfigBase& config )
@@ -114,7 +114,7 @@ public:
TQFont font() const { return mFont; }
void setDefaultAppearance() {
- mForegroundColor = mIsExpired ? Qt::red : TQColor();
+ mForegroundColor = mIsExpired ? TQt::red : TQColor();
mBackgroundColor = TQColor();
mHasFont = false;
mFont = TQFont();
@@ -178,8 +178,8 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in
////
Kleo::AppearanceConfigWidget::AppearanceConfigWidget (
- TQWidget* parent, const char* name, WFlags fl )
- : AppearanceConfigWidgetBase( parent, name, fl )
+ TQWidget* tqparent, const char* name, WFlags fl )
+ : AppearanceConfigWidgetBase( tqparent, name, fl )
{
categoriesLV->setSorting( -1 );
load();
@@ -192,7 +192,7 @@ Kleo::AppearanceConfigWidget::AppearanceConfigWidget (
AppearanceConfigWidget::~AppearanceConfigWidget()
{
- // no need to delete child widgets, Qt does it all for us
+ // no need to delete child widgets, TQt does it all for us
}
diff --git a/certmanager/conf/appearanceconfigwidget.h b/certmanager/conf/appearanceconfigwidget.h
index 5e7c1f8c..917a1cfb 100644
--- a/certmanager/conf/appearanceconfigwidget.h
+++ b/certmanager/conf/appearanceconfigwidget.h
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -42,10 +42,11 @@ namespace Kleo {
class AppearanceConfigWidget : public AppearanceConfigWidgetBase {
Q_OBJECT
+ TQ_OBJECT
public:
AppearanceConfigWidget(
- TQWidget * parent=0, const char * name=0, WFlags f=0 );
+ TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
~AppearanceConfigWidget();
void load();
diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui
index 60e10c21..9fb7af20 100644
--- a/certmanager/conf/appearanceconfigwidgetbase.ui
+++ b/certmanager/conf/appearanceconfigwidgetbase.ui
@@ -1,6 +1,6 @@
AppearanceConfigWidgetBase
-
+
AppearanceConfigWidgetBase
@@ -19,7 +19,7 @@
unnamed
-
+
Key Categories
@@ -35,7 +35,7 @@
categoriesLV
-
+
tqlayout2
@@ -43,7 +43,7 @@
unnamed
-
+
foregroundButton
@@ -54,7 +54,7 @@
Set &Text Color...
-
+
backgroundButton
@@ -65,7 +65,7 @@
Set &Background Color...
-
+
fontButton
@@ -76,7 +76,7 @@
Set F&ont...
-
+
italicCB
@@ -87,7 +87,7 @@
Italic
-
+
boldCB
@@ -98,7 +98,7 @@
Bold
-
+