summaryrefslogtreecommitdiffstats
path: root/konqueror/about
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /konqueror/about
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konqueror/about')
-rw-r--r--konqueror/about/konq_aboutpage.cc30
-rw-r--r--konqueror/about/konq_aboutpage.h4
-rw-r--r--konqueror/about/specs.html2
3 files changed, 18 insertions, 18 deletions
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index c9c83fd4f..6291b72d5 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -50,15 +50,15 @@ KonqAboutPageFactory::~KonqAboutPageFactory()
s_plugins_html = 0;
}
-KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
+KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *, const TQStringList & )
{
- //KonqFrame *frame = dynamic_cast<KonqFrame *>( parentWidget );
+ //KonqFrame *frame = dynamic_cast<KonqFrame *>( tqparentWidget );
//if ( !frame ) return 0;
return new KonqAboutPage( //frame->childView()->mainWindow(),
- parentWidget, widgetName, parent, name );
+ tqparentWidget, widgetName, parent, name );
}
TQString KonqAboutPageFactory::loadFile( const TQString& file )
@@ -77,12 +77,12 @@ TQString KonqAboutPageFactory::loadFile( const TQString& file )
res = t.read();
// otherwise all embedded objects are referenced as about:/...
- TQString basehref = TQString::fromLatin1("<BASE HREF=\"file:") +
- file.left( file.findRev( '/' )) +
- TQString::fromLatin1("/\">\n");
+ TQString basehref = TQString::tqfromLatin1("<BASE HREF=\"file:") +
+ file.left( file.tqfindRev( '/' )) +
+ TQString::tqfromLatin1("/\">\n");
TQRegExp reg("<head>");
reg.setCaseSensitive(FALSE);
- res.replace(reg, "<head>\n\t" + basehref);
+ res.tqreplace(reg, "<head>\n\t" + basehref);
return res;
}
@@ -295,7 +295,7 @@ TQString KonqAboutPageFactory::specs()
.arg( i18n("Secure Sockets Layer") )
.arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") )
.arg( i18n("OpenSSL") )
- .arg( i18n("Bidirectional 16bit unicode support") )
+ .arg( i18n("Bidirectional 16bit tqunicode support") )
.arg( i18n("built-in") )
.arg( i18n("AutoCompletion for forms") )
.arg( i18n("built-in") )
@@ -427,9 +427,9 @@ TQString KonqAboutPageFactory::plugins()
KonqAboutPage::KonqAboutPage( //KonqMainWindow *
- TQWidget *parentWidget, const char *widgetName,
+ TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name )
- : KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI )
+ : KHTMLPart( tqparentWidget, widgetName, parent, name, BrowserViewGUI )
{
//m_mainWindow = mainWindow;
TQTextCodec* codec = KGlobal::locale()->codecForEncoding();
@@ -507,32 +507,32 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con
return;
}
- if ( url == TQString::fromLatin1("launch.html") )
+ if ( url == TQString::tqfromLatin1("launch.html") )
{
emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::launch(), "konqueror" );
return;
}
- else if ( url == TQString::fromLatin1("intro.html") )
+ else if ( url == TQString::tqfromLatin1("intro.html") )
{
emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::intro(), "konqueror" );
return;
}
- else if ( url == TQString::fromLatin1("specs.html") )
+ else if ( url == TQString::tqfromLatin1("specs.html") )
{
emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::specs(), "konqueror" );
return;
}
- else if ( url == TQString::fromLatin1("tips.html") )
+ else if ( url == TQString::tqfromLatin1("tips.html") )
{
emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::tips(), "konqueror" );
return;
}
- else if ( url == TQString::fromLatin1("config:/disable_overview") )
+ else if ( url == TQString::tqfromLatin1("config:/disable_overview") )
{
if ( KMessageBox::questionYesNo( widget(),
i18n("Do you want to disable showing "
diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h
index c72a85250..3d53cf02c 100644
--- a/konqueror/about/konq_aboutpage.h
+++ b/konqueror/about/konq_aboutpage.h
@@ -13,7 +13,7 @@ public:
KonqAboutPageFactory( TQObject *parent = 0, const char *name = 0 );
virtual ~KonqAboutPageFactory();
- virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
+ virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
@@ -37,7 +37,7 @@ class KonqAboutPage : public KHTMLPart
Q_OBJECT
public:
KonqAboutPage( /*KonqMainWindow *mainWindow,*/
- TQWidget *parentWidget, const char *widgetName,
+ TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name );
~KonqAboutPage();
diff --git a/konqueror/about/specs.html b/konqueror/about/specs.html
index b04212067..4989754cf 100644
--- a/konqueror/about/specs.html
+++ b/konqueror/about/specs.html
@@ -121,7 +121,7 @@
<td valign="top"><a href="http://www.openssl.org">%1<!--OpenSSL--></a></td>
</tr>
<tr bgcolor="#fff4c9">
- <td valign="top">%1<!--Bidirectional 16bit unicode support--></td>
+ <td valign="top">%1<!--Bidirectional 16bit tqunicode support--></td>
<td valign="top">&nbsp;</td>
<td valign="top">%1<!--built-in--></td>
</tr>