From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- akregator/src/akregator_view.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'akregator/src/akregator_view.cpp') diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 0d9b56afd..6df0469c7 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -145,7 +145,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor virtual bool visitTagNode(TagNode* node) { - TQString msg = i18n("Are you sure you want to delete tag %1? The tag will be removed from all articles.").arg(node->title()); + TQString msg = i18n("Are you sure you want to delete tag %1? The tag will be removed from all articles.").tqarg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue) { Tag tag = node->tag(); @@ -166,7 +166,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor if (node->title().isEmpty()) msg = i18n("Are you sure you want to delete this folder and its feeds and subfolders?"); else - msg = i18n("Are you sure you want to delete folder %1 and its feeds and subfolders?").arg(node->title()); + msg = i18n("Are you sure you want to delete folder %1 and its feeds and subfolders?").tqarg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue) { @@ -182,7 +182,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor if (node->title().isEmpty()) msg = i18n("Are you sure you want to delete this feed?"); else - msg = i18n("Are you sure you want to delete feed %1?").arg(node->title()); + msg = i18n("Are you sure you want to delete feed %1?").tqarg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue) { @@ -222,11 +222,11 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co m_shuttingDown = false; m_displayingAboutPage = false; m_currentFrame = 0L; - setFocusPolicy(TQWidget::StrongFocus); + setFocusPolicy(Qt::StrongFocus); TQVBoxLayout *lt = new TQVBoxLayout( this ); - m_horizontalSplitter = new TQSplitter(TQSplitter::Horizontal, this); + m_horizontalSplitter = new TQSplitter(Qt::Horizontal, this); m_horizontalSplitter->setOpaqueResize(true); lt->addWidget(m_horizontalSplitter); @@ -285,7 +285,7 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co mainTabLayout->addWidget(m_searchBar); - m_articleSplitter = new TQSplitter(TQSplitter::Vertical, m_mainTab, "panner2"); + m_articleSplitter = new TQSplitter(Qt::Vertical, m_mainTab, "panner2"); m_articleList = new ArticleListView( m_articleSplitter, "articles" ); m_actionManager->initArticleListView(m_articleList); @@ -317,7 +317,7 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co TQWhatsThis::add(m_articleViewer->widget(), i18n("Browsing area.")); mainTabLayout->addWidget( m_articleSplitter ); - m_mainFrame=new Frame(this, m_part, m_mainTab, i18n("Articles"), false); + m_mainFrame=new Frame(TQT_TQOBJECT(this), m_part, m_mainTab, i18n("Articles"), false); connectFrame(m_mainFrame); m_tabs->addFrame(m_mainFrame); @@ -431,7 +431,7 @@ void View::slotOpenNewTab(const KURL& url, bool background) connect( page, TQT_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)), this, TQT_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) ); - Frame* frame = new Frame(this, page, page->widget(), i18n("Untitled")); + Frame* frame = new Frame(TQT_TQOBJECT(this), page, page->widget(), i18n("Untitled")); frame->setAutoDeletePart(true); // delete page viewer when removing the tab connect(page, TQT_SIGNAL(setWindowCaption (const TQString &)), frame, TQT_SLOT(setTitle (const TQString &))); @@ -638,7 +638,7 @@ void View::slotNormalView() m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode()); } - m_articleSplitter->setOrientation(TQSplitter::Vertical); + m_articleSplitter->setOrientation(Qt::Vertical); m_viewMode = NormalView; Settings::setViewMode( m_viewMode ); @@ -662,7 +662,7 @@ void View::slotWidescreenView() m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode()); } - m_articleSplitter->setOrientation(TQSplitter::Horizontal); + m_articleSplitter->setOrientation(Qt::Horizontal); m_viewMode = WidescreenView; Settings::setViewMode( m_viewMode ); @@ -1100,7 +1100,7 @@ void View::slotFeedFetched(Feed *feed) void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int) { - if (button == TQt::MidButton) + if (button == Qt::MidButton) { KURL link = article.link(); switch (Settings::mMBBehaviour()) @@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress() link = article.link().url(); else link = article.guid(); - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setText(link, TQClipboard::Clipboard); cb->setText(link, TQClipboard::Selection); } @@ -1312,7 +1312,7 @@ void View::slotArticleDelete() case 0: return; case 1: - msg = i18n("Are you sure you want to delete article %1?").arg(TQStyleSheet::escape(articles.first().title())); + msg = i18n("Are you sure you want to delete article %1?").tqarg(TQStyleSheet::escape(articles.first().title())); break; default: msg = i18n("Are you sure you want to delete the selected article?", -- cgit v1.2.1