summaryrefslogtreecommitdiffstats
path: root/akregator/src/pageviewer.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
commit1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch)
treef2defe163a805a9e34a2142dfde4cdb5e49241e7 /akregator/src/pageviewer.cpp
parent67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff)
downloadtdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz
tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip
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
Diffstat (limited to 'akregator/src/pageviewer.cpp')
-rw-r--r--akregator/src/pageviewer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 64169225f..477575906 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -53,7 +53,7 @@
#include <tqscrollview.h>
#include <tqstring.h>
#include <tqvaluelist.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
#include <cstdlib>
using std::abs;
@@ -356,13 +356,13 @@ void PageViewer::slotCancelled( const TQString & /*errMsg*/ )
void PageViewer::urlSelected(const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args)
{
- if (url.startsWith(TQString::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) )
+ if (url.tqstartsWith(TQString::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) )
{
KHTMLPart::urlSelected(url,button,state,_target,args);
}
else
{
- if (button == LeftButton)
+ if (button == Qt::LeftButton)
{
m_url = completeURL(url);
browserExtension()->setURLArgs(args);
@@ -390,7 +390,7 @@ void PageViewer::slotPaletteOrFontChanged()
if ( !obj ) // not all views have a browser extension !
return;
- int id = obj->tqmetaObject()->findSlot("reparseConfiguration()");
+ int id = obj->tqmetaObject()->tqfindSlot("reparseConfiguration()");
if (id == -1)
return;
TQUObject o[1];
@@ -430,7 +430,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
if (isLink)
{
idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab()));
- popup.setWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab."));
+ popup.tqsetWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab."));
popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser()));
popup.insertSeparator();