summaryrefslogtreecommitdiffstats
path: root/konqueror
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
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')
-rw-r--r--konqueror/KonqMainWindowIface.cc6
-rw-r--r--konqueror/KonquerorIface.cc18
-rw-r--r--konqueror/about/konq_aboutpage.cc30
-rw-r--r--konqueror/about/konq_aboutpage.h4
-rw-r--r--konqueror/about/specs.html2
-rw-r--r--konqueror/client/kfmclient.cc56
-rw-r--r--konqueror/delayedinitializer.h2
-rw-r--r--konqueror/iconview/konq_iconview.cc32
-rw-r--r--konqueror/iconview/konq_iconview.h2
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp92
-rw-r--r--konqueror/keditbookmarks/commands.cpp6
-rw-r--r--konqueror/keditbookmarks/favicons.cpp2
-rw-r--r--konqueror/keditbookmarks/importers.cpp2
-rw-r--r--konqueror/keditbookmarks/kbookmarkmerger.cpp2
-rw-r--r--konqueror/keditbookmarks/listview.cpp32
-rw-r--r--konqueror/keditbookmarks/listview.h10
-rw-r--r--konqueror/keditbookmarks/main.cpp8
-rw-r--r--konqueror/keditbookmarks/testlink.cpp10
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp16
-rw-r--r--konqueror/konq_actions.cc2
-rw-r--r--konqueror/konq_combo.cc50
-rw-r--r--konqueror/konq_extensionmanager.cc4
-rw-r--r--konqueror/konq_factory.cc16
-rw-r--r--konqueror/konq_factory.h2
-rw-r--r--konqueror/konq_frame.cc74
-rw-r--r--konqueror/konq_frame.h2
-rw-r--r--konqueror/konq_guiclients.cc10
-rw-r--r--konqueror/konq_guiclients.h2
-rw-r--r--konqueror/konq_main.cc8
-rw-r--r--konqueror/konq_main.h2
-rw-r--r--konqueror/konq_mainwindow.cc410
-rw-r--r--konqueror/konq_mainwindow.h18
-rw-r--r--konqueror/konq_misc.cc8
-rw-r--r--konqueror/konq_misc.h2
-rw-r--r--konqueror/konq_profiledlg.cc12
-rw-r--r--konqueror/konq_profiledlg.h2
-rw-r--r--konqueror/konq_tabs.cc12
-rw-r--r--konqueror/konq_view.cc60
-rw-r--r--konqueror/konq_view.h2
-rw-r--r--konqueror/konq_viewmgr.cc54
-rw-r--r--konqueror/konqueror.kcfg2
-rw-r--r--konqueror/listview/konq_infolistviewitem.cc6
-rw-r--r--konqueror/listview/konq_infolistviewitem.h2
-rw-r--r--konqueror/listview/konq_infolistviewwidget.cc10
-rw-r--r--konqueror/listview/konq_infolistviewwidget.h2
-rw-r--r--konqueror/listview/konq_listview.cc20
-rw-r--r--konqueror/listview/konq_listview.h4
-rw-r--r--konqueror/listview/konq_listviewitems.cc24
-rw-r--r--konqueror/listview/konq_listviewitems.h2
-rw-r--r--konqueror/listview/konq_listviewwidget.cc72
-rw-r--r--konqueror/listview/konq_listviewwidget.h4
-rw-r--r--konqueror/listview/konq_textviewitem.cc4
-rw-r--r--konqueror/listview/konq_textviewitem.h2
-rw-r--r--konqueror/listview/konq_textviewwidget.cc6
-rw-r--r--konqueror/listview/konq_textviewwidget.h2
-rw-r--r--konqueror/listview/konq_treeviewwidget.cc6
-rw-r--r--konqueror/listview/konq_treeviewwidget.h2
-rw-r--r--konqueror/preloader/preloader.cc4
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.cpp4
-rw-r--r--konqueror/shellcmdplugin/kshellcmddialog.cpp8
-rw-r--r--konqueror/shellcmdplugin/kshellcmdexecutor.cpp8
-rw-r--r--konqueror/shellcmdplugin/kshellcmdexecutor.h2
-rw-r--r--konqueror/sidebar/konqsidebar.cpp12
-rw-r--r--konqueror/sidebar/konqsidebar.h4
-rw-r--r--konqueror/sidebar/konqsidebarplugin.cpp2
-rw-r--r--konqueror/sidebar/konqsidebarplugin.h2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp61
-rw-r--r--konqueror/sidebar/sidebar_widget.h6
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp12
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp12
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.h2
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp6
-rw-r--r--konqueror/sidebar/trees/history_module/history_dlg.ui36
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.cpp16
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.h2
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp14
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.cpp8
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp8
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp52
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.h4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreeitem.h2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp6
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.cpp6
-rw-r--r--konqueror/sidebar/web_module/web_module.h4
84 files changed, 779 insertions, 778 deletions
diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc
index 462c08aed..0b3d05ed6 100644
--- a/konqueror/KonqMainWindowIface.cc
+++ b/konqueror/KonqMainWindowIface.cc
@@ -153,13 +153,13 @@ TQMap<TQCString,DCOPRef> KonqMainWindowIface::actionMap()
QCStringList KonqMainWindowIface::functionsDynamic()
{
- return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( m_pMainWindow );
+ return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( TQT_TQOBJECT(m_pMainWindow) );
}
bool KonqMainWindowIface::processDynamic( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData )
{
- if ( KDCOPPropertyProxy::isPropertyRequest( fun, m_pMainWindow ) )
- return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, m_pMainWindow );
+ if ( KDCOPPropertyProxy::isPropertyRequest( fun, TQT_TQOBJECT(m_pMainWindow) ) )
+ return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, TQT_TQOBJECT(m_pMainWindow) );
return DCOPObject::processDynamic( fun, data, replyType, replyData );
}
diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc
index ce7850967..a22788858 100644
--- a/konqueror/KonquerorIface.cc
+++ b/konqueror/KonquerorIface.cc
@@ -252,18 +252,18 @@ bool KonquerorIface::processCanBeReused( int screen )
TQStringList allowed_parts = KonqSettings::safeParts();
bool all_parts_allowed = false;
- if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "SAFE" ))
+ if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "SAFE" ))
{
allowed_parts.clear();
// is duplicated in client/kfmclient.cc
- allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" )
- << TQString::fromLatin1( "konq_multicolumnview.desktop" )
- << TQString::fromLatin1( "konq_sidebartng.desktop" )
- << TQString::fromLatin1( "konq_infolistview.desktop" )
- << TQString::fromLatin1( "konq_treeview.desktop" )
- << TQString::fromLatin1( "konq_detailedlistview.desktop" );
+ allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" )
+ << TQString::tqfromLatin1( "konq_multicolumnview.desktop" )
+ << TQString::tqfromLatin1( "konq_sidebartng.desktop" )
+ << TQString::tqfromLatin1( "konq_infolistview.desktop" )
+ << TQString::tqfromLatin1( "konq_treeview.desktop" )
+ << TQString::tqfromLatin1( "konq_detailedlistview.desktop" );
}
- else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" ))
+ else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "ALL" ))
{
allowed_parts.clear();
all_parts_allowed = true;
@@ -281,7 +281,7 @@ bool KonquerorIface::processCanBeReused( int screen )
++it2 )
{
kdDebug(1202) << "processCanBeReused: part=" << (*it2)->service()->desktopEntryPath() << ", URL=" << (*it2)->url().prettyURL() << endl;
- if( !allowed_parts.contains( (*it2)->service()->desktopEntryPath()))
+ if( !allowed_parts.tqcontains( (*it2)->service()->desktopEntryPath()))
return false;
}
}
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>
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 60a384102..b318a205b 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -178,33 +178,33 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
*/
static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& profile )
{
- KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
+ KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true );
cfg.setGroup( "Reusing" );
TQStringList allowed_parts;
// is duplicated in ../KonquerorIface.cc
- allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" )
- << TQString::fromLatin1( "konq_multicolumnview.desktop" )
- << TQString::fromLatin1( "konq_sidebartng.desktop" )
- << TQString::fromLatin1( "konq_infolistview.desktop" )
- << TQString::fromLatin1( "konq_treeview.desktop" )
- << TQString::fromLatin1( "konq_detailedlistview.desktop" );
+ allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" )
+ << TQString::tqfromLatin1( "konq_multicolumnview.desktop" )
+ << TQString::tqfromLatin1( "konq_sidebartng.desktop" )
+ << TQString::tqfromLatin1( "konq_infolistview.desktop" )
+ << TQString::tqfromLatin1( "konq_treeview.desktop" )
+ << TQString::tqfromLatin1( "konq_detailedlistview.desktop" );
if( cfg.hasKey( "SafeParts" )
- && cfg.readEntry( "SafeParts" ) != TQString::fromLatin1( "SAFE" ))
+ && cfg.readEntry( "SafeParts" ) != TQString::tqfromLatin1( "SAFE" ))
allowed_parts = cfg.readListEntry( "SafeParts" );
- if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" ))
+ if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "ALL" ))
return false; // all parts allowed
if( url.isEmpty())
{
if( profile.isEmpty())
return true;
- TQString profilepath = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profile );
+ TQString profilepath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profile );
if( profilepath.isEmpty())
return true;
KConfig cfg( profilepath, true );
cfg.setDollarExpansion( true );
cfg.setGroup( "Profile" );
- TQMap< TQString, TQString > entries = cfg.entryMap( TQString::fromLatin1( "Profile" ));
- TQRegExp urlregexp( TQString::fromLatin1( "^View[0-9]*_URL$" ));
+ TQMap< TQString, TQString > entries = cfg.entryMap( TQString::tqfromLatin1( "Profile" ));
+ TQRegExp urlregexp( TQString::tqfromLatin1( "^View[0-9]*_URL$" ));
TQStringList urls;
for( TQMap< TQString, TQString >::ConstIterator it = entries.begin();
it != entries.end();
@@ -218,16 +218,16 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString&
if( urls.count() != 1 )
return true;
url = urls.first();
- mimetype = TQString::fromLatin1( "" );
+ mimetype = TQString::tqfromLatin1( "" );
}
if( mimetype.isEmpty())
mimetype = KMimeType::findByURL( KURL( url ) )->name();
- KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ),
+ KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::tqfromLatin1( "KParts/ReadOnlyPart" ),
TQString::null, TQString::null );
KService::Ptr serv;
if( offers.count() > 0 )
serv = offers.first();
- return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + TQString::fromLatin1(".desktop") );
+ return serv == NULL || !allowed_parts.tqcontains( serv->desktopEntryName() + TQString::tqfromLatin1(".desktop") );
}
static int currentScreen()
@@ -248,7 +248,7 @@ static int currentScreen()
// when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile !
static TQCString getPreloadedKonqy()
{
- KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
+ KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true );
cfg.setGroup( "Reusing" );
if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 )
return "";
@@ -301,8 +301,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
// check if user wants to use external browser
// ###### this option seems to have no GUI and to be redundant with BrowserApplication now.
// ###### KDE4: remove
- KConfig config( TQString::fromLatin1("kfmclientrc"));
- config.setGroup( TQString::fromLatin1("Settings"));
+ KConfig config( TQString::tqfromLatin1("kfmclientrc"));
+ config.setGroup( TQString::tqfromLatin1("Settings"));
TQString strBrowser = config.readPathEntry("ExternalBrowser");
if (!strBrowser.isEmpty())
{
@@ -314,7 +314,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
return true;
}
- if (url.protocol().startsWith(TQString::fromLatin1("http")))
+ if (url.protocol().startsWith(TQString::tqfromLatin1("http")))
{
config.setGroup("General");
if (!config.readEntry("BrowserApplication").isEmpty())
@@ -330,7 +330,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
}
}
- KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
+ KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true );
cfg.setGroup( "FMSettings" );
if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) )
{
@@ -361,7 +361,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
{
TQString error;
/* Well, we can't pass a mimetype through startServiceByDesktopPath !
- if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
+ if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"),
url.url(), &error ) > 0 )
{
kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
@@ -391,8 +391,8 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url,
if( appId.isEmpty())
{
TQString error;
- if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
- TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 )
+ if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"),
+ TQString::tqfromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 )
{
kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
return false;
@@ -401,10 +401,10 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url,
// so when we arrive here, konq is up and running already, and appId contains the identification
}
- TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName );
+ TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName );
if ( profile.isEmpty() )
{
- fprintf( stderr, "%s", i18n("Profile %1 not found\n").arg(profileName).local8Bit().data() );
+ fprintf( stderr, "%s", i18n("Profile %1 not found\n").tqarg(profileName).local8Bit().data() );
::exit( 0 );
}
KonquerorIface_stub konqy( appId, "KonquerorIface" );
@@ -479,7 +479,7 @@ bool clientApp::doIt()
}
if ( argc == 3 )
{
- return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::fromLatin1(args->arg(2)) );
+ return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::tqfromLatin1(args->arg(2)) );
}
}
else if ( command == "openProfile" )
@@ -529,7 +529,7 @@ bool clientApp::doIt()
{
KURL::List urls;
urls.append( args->url(1) );
- const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null );
+ const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::tqfromLatin1( "Application" ), TQString::null, TQString::null );
if (offers.isEmpty()) return 1;
KService::Ptr serv = offers.first();
return KRun::run( *serv, urls );
@@ -630,7 +630,7 @@ bool clientApp::doIt()
}
else
{
- fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").arg(TQString::fromLocal8Bit(command)).local8Bit().data() );
+ fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").tqarg(TQString::fromLocal8Bit(command)).local8Bit().data() );
return false;
}
return true;
diff --git a/konqueror/delayedinitializer.h b/konqueror/delayedinitializer.h
index 1f9f66470..a9119ba58 100644
--- a/konqueror/delayedinitializer.h
+++ b/konqueror/delayedinitializer.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
-class DelayedInitializer : public QObject
+class DelayedInitializer : public TQObject
{
Q_OBJECT
public:
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index cf567c33f..f9129ce71 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -72,13 +72,13 @@ public:
s_defaultViewProps = 0;
}
- virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *,
+ virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *,
TQObject *parent, const char *name, const char*, const TQStringList &args )
{
if( args.count() < 1 )
kdWarning() << "KonqKfmIconView: Missing Parameter" << endl;
- KonqKfmIconView *obj = new KonqKfmIconView( parentWidget, parent, name,args.first() );
+ KonqKfmIconView *obj = new KonqKfmIconView( tqparentWidget, parent, name,args.first() );
return obj;
}
@@ -164,7 +164,7 @@ void IconViewBrowserExtension::setNameFilter( const TQString &nameFilter )
m_iconView->m_nameFilter = nameFilter;
}
-KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode )
+KonqKfmIconView::KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode )
: KonqDirPart( parent, name )
, m_bNeedSetCurrentItem( false )
, m_pEnsureVisible( 0 )
@@ -179,7 +179,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
// Create a properties instance for this view
m_pProps = new KonqPropsView( KonqIconViewFactory::instance(), KonqIconViewFactory::defaultViewProps() );
- m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" );
+ m_pIconView = new KonqIconViewWidget( tqparentWidget, "qiconview" );
m_pIconView->initConfig( true );
connect( m_pIconView, TQT_SIGNAL(imagePreviewFinished()),
@@ -206,7 +206,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
setXMLFile( "konq_iconview.rc" );
- // Don't repaint on configuration changes during construction
+ // Don't tqrepaint on configuration changes during construction
m_bInit = true;
m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ),
@@ -359,7 +359,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
// Create the directory lister
m_dirLister = new KDirLister( true );
setDirLister( m_dirLister );
- m_dirLister->setMainWindow(m_pIconView->topLevelWidget());
+ m_dirLister->setMainWindow(m_pIconView->tqtopLevelWidget());
connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ),
this, TQT_SLOT( slotStarted() ) );
@@ -429,7 +429,7 @@ const KFileItem * KonqKfmIconView::currentItem()
void KonqKfmIconView::slotPreview( bool toggle )
{
- TQCString name = sender()->name(); // e.g. clipartthumbnail (or audio/, special case)
+ TQCString name = TQT_TQOBJECT_CONST(sender())->name(); // e.g. clipartthumbnail (or audio/, special case)
if (name == "iconview_preview_all")
{
m_pProps->setShowingPreview( toggle );
@@ -686,7 +686,7 @@ void KonqKfmIconView::newIconSize( int size )
// Stop a preview job that might be running
m_pIconView->stopImagePreview();
- // Set icons size, arrage items in grid and repaint the whole view
+ // Set icons size, arrage items in grid and tqrepaint the whole view
m_pIconView->setIcons( size );
// If previews are enabled start a new job
@@ -794,7 +794,7 @@ void KonqKfmIconView::slotContextMenuRequested(TQIconViewItem* _item, const TQPo
void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, const TQPoint&)
{
- if ( _button == RightButton && !_item )
+ if ( _button == Qt::RightButton && !_item )
{
// Right click on viewport
KFileItem * item = m_dirLister->rootItem();
@@ -831,7 +831,7 @@ void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item,
void KonqKfmIconView::slotMouseButtonClicked(int _button, TQIconViewItem* _item, const TQPoint& )
{
- if( _button == MidButton )
+ if( _button == Qt::MidButton )
mmbClicked( _item ? static_cast<KFileIVI*>(_item)->item() : 0L );
}
@@ -873,7 +873,7 @@ void KonqKfmIconView::slotCanceled( const KURL& url )
if ( !m_pIconView->viewport()->isUpdatesEnabled() )
{
m_pIconView->viewport()->setUpdatesEnabled( true );
- m_pIconView->viewport()->repaint();
+ m_pIconView->viewport()->tqrepaint();
}
if ( m_pEnsureVisible ){
m_pIconView->ensureItemVisible( m_pEnsureVisible );
@@ -889,11 +889,11 @@ void KonqKfmIconView::slotCompleted()
m_pTimeoutRefreshTimer->stop();
// If updates to the viewport are still blocked (so slotNewItems() has
- // not been called), a viewport repaint is forced.
+ // not been called), a viewport tqrepaint is forced.
if ( !m_pIconView->viewport()->isUpdatesEnabled() )
{
m_pIconView->viewport()->setUpdatesEnabled( true );
- m_pIconView->viewport()->repaint();
+ m_pIconView->viewport()->tqrepaint();
}
// Root item ? Store root item in konqiconviewwidget (whether 0L or not)
@@ -962,7 +962,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
KFileItem* fileItem = item->item();
if ( !m_itemsToSelect.isEmpty() ) {
- TQStringList::Iterator tsit = m_itemsToSelect.find( fileItem->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.tqfind( fileItem->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
m_pIconView->setSelected( item, true, true );
@@ -1136,7 +1136,7 @@ void KonqKfmIconView::slotRefreshItems( const KFileItemList& entries )
}
else
{
- // In case we replace a big icon with a small one, need to repaint.
+ // In case we replace a big icon with a small one, need to tqrepaint.
if ( bNeedRepaint )
m_pIconView->updateContents();
}
@@ -1248,7 +1248,7 @@ void KonqKfmIconView::slotRefreshViewport()
TQWidget * vp = m_pIconView->viewport();
bool prevState = vp->isUpdatesEnabled();
vp->setUpdatesEnabled( true );
- vp->repaint();
+ vp->tqrepaint();
vp->setUpdatesEnabled( prevState );
}
diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h
index 517734182..b1ac6df9d 100644
--- a/konqueror/iconview/konq_iconview.h
+++ b/konqueror/iconview/konq_iconview.h
@@ -51,7 +51,7 @@ public:
enum SortCriterion { NameCaseSensitive, NameCaseInsensitive, Size, Type, Date };
- KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode );
+ KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode );
virtual ~KonqKfmIconView();
virtual const KFileItem * currentItem();
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 2aafe885c..bbfb548ad 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -80,136 +80,136 @@ void KEBApp::createActions() {
// save and quit should probably not be in the toplevel???
(void) KStdAction::quit(
- this, TQT_SLOT( close() ), actionCollection());
+ TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
(void) KStdAction::configureToolbars(
- this, TQT_SLOT( slotConfigureToolbars() ), actionCollection());
+ TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection());
if (m_browser) {
(void) KStdAction::open(
- actn, TQT_SLOT( slotLoad() ), actionCollection());
+ TQT_TQOBJECT(actn), TQT_SLOT( slotLoad() ), actionCollection());
(void) KStdAction::saveAs(
- actn, TQT_SLOT( slotSaveAs() ), actionCollection());
+ TQT_TQOBJECT(actn), TQT_SLOT( slotSaveAs() ), actionCollection());
}
- (void) KStdAction::cut(actn, TQT_SLOT( slotCut() ), actionCollection());
- (void) KStdAction::copy(actn, TQT_SLOT( slotCopy() ), actionCollection());
- (void) KStdAction::paste(actn, TQT_SLOT( slotPaste() ), actionCollection());
- (void) KStdAction::print(actn, TQT_SLOT( slotPrint() ), actionCollection());
+ (void) KStdAction::cut(TQT_TQOBJECT(actn), TQT_SLOT( slotCut() ), actionCollection());
+ (void) KStdAction::copy(TQT_TQOBJECT(actn), TQT_SLOT( slotCopy() ), actionCollection());
+ (void) KStdAction::paste(TQT_TQOBJECT(actn), TQT_SLOT( slotPaste() ), actionCollection());
+ (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), actionCollection());
// settings menu
(void) new KToggleAction(
i18n("&Show Netscape Bookmarks in Konqueror"), 0,
- actn, TQT_SLOT( slotShowNS() ), actionCollection(),
+ TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(),
"settings_showNS");
// actions
(void) new KAction(
i18n("&Delete"), "editdelete", Key_Delete,
- actn, TQT_SLOT( slotDelete() ), actionCollection(), "delete");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete");
(void) new KAction(
i18n("Rename"), "text", Key_F2,
- actn, TQT_SLOT( slotRename() ), actionCollection(), "rename");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename");
(void) new KAction(
i18n("C&hange URL"), "text", Key_F3,
- actn, TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
(void) new KAction(
i18n("C&hange Comment"), "text", Key_F4,
- actn, TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
(void) new KAction(
i18n("Chan&ge Icon..."), "icons", 0,
- actn, TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
(void) new KAction(
i18n("Update Favicon"), 0,
- actn, TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
(void) new KAction(
i18n("Recursive Sort"), 0,
- actn, TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
(void) new KAction(
i18n("&New Folder..."), "folder_new", CTRL+Key_N,
- actn, TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
(void) new KAction(
i18n("&New Bookmark"), "www", 0,
- actn, TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
(void) new KAction(
i18n("&Insert Separator"), CTRL+Key_I,
- actn, TQT_SLOT( slotInsertSeparator() ), actionCollection(),
+ TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(),
"insertseparator");
(void) new KAction(
i18n("&Sort Alphabetically"), 0,
- actn, TQT_SLOT( slotSort() ), actionCollection(), "sort");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort");
(void) new KAction(
i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0,
- actn, TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
(void) new KAction(
i18n("Show in T&oolbar"), "bookmark_toolbar", 0,
- actn, TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
(void) new KAction(
i18n("Hide in T&oolbar"), "bookmark_toolbar", 0,
- actn, TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
(void) new KAction(
i18n("&Expand All Folders"), 0,
- actn, TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
(void) new KAction(
i18n("Collapse &All Folders"), 0,
- actn, TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
+ TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
(void) new KAction(
i18n("&Open in Konqueror"), "fileopen", 0,
- actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
+ TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
(void) new KAction(
i18n("Check &Status"), "bookmark", 0,
- actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
+ TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
(void) new KAction(
i18n("Check Status: &All"), 0,
- actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
+ TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
(void) new KAction(
i18n("Update All &Favicons"), 0,
- actn, TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
+ TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
"updateallfavicons" );
(void) new KAction(
i18n("Cancel &Checks"), 0,
- actn, TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
+ TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
(void) new KAction(
i18n("Cancel &Favicon Updates"), 0,
- actn, TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
+ TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
"cancelfaviconupdates" );
(void) new KAction(
i18n("Import &Netscape Bookmarks..."), "netscape", 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importNS");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS");
(void) new KAction(
i18n("Import &Opera Bookmarks..."), "opera", 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
(void) new KAction(
i18n("Import All &Crash Sessions as Bookmarks..."), 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
(void) new KAction(
i18n("Import &Galeon Bookmarks..."), 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
(void) new KAction(
i18n("Import &KDE2/KDE3 Bookmarks..."), 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
(void) new KAction(
i18n("Import &IE Bookmarks..."), 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importIE");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE");
(void) new KAction(
i18n("Import &Mozilla Bookmarks..."), "mozilla", 0,
- actn, TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
(void) new KAction(
i18n("Export to &Netscape Bookmarks"), "netscape", 0,
- actn, TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
(void) new KAction(
i18n("Export to &Opera Bookmarks..."), "opera", 0,
- actn, TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
(void) new KAction(
i18n("Export to &HTML Bookmarks..."), "html", 0,
- actn, TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
(void) new KAction(
i18n("Export to &IE Bookmarks..."), 0,
- actn, TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
(void) new KAction(
i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0,
- actn, TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
+ TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
}
void ActionsImpl::slotLoad() {
@@ -345,7 +345,7 @@ void ActionsImpl::slotCopy() {
TQValueList<KBookmark> bookmarks
= ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */);
- kapp->clipboard()->setData(data, QClipboard::Clipboard);
+ kapp->tqclipboard()->setData(data, QClipboard::Clipboard);
}
void ActionsImpl::slotPaste() {
@@ -353,7 +353,7 @@ void ActionsImpl::slotPaste() {
KEBMacroCommand *mcmd =
CmdGen::insertMimeSource(
i18n("Paste"),
- kapp->clipboard()->data(QClipboard::Clipboard),
+ kapp->tqclipboard()->data(QClipboard::Clipboard),
ListView::self()->userAddress());
CmdHistory::self()->didCommand(mcmd);
}
@@ -394,7 +394,7 @@ void ActionsImpl::slotImport() {
// kdDebug() << "ActionsImpl::slotImport() where sender()->name() == "
// << sender()->name() << endl;
ImportCommand* import
- = ImportCommand::performImport(sender()->name()+6, KEBApp::self());
+ = ImportCommand::performImport(TQT_TQOBJECT_CONST(sender())->name()+6, KEBApp::self());
if (!import)
return;
CmdHistory::self()->addCommand(import);
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index 2ad58a682..c7c5f83a6 100644
--- a/konqueror/keditbookmarks/commands.cpp
+++ b/konqueror/keditbookmarks/commands.cpp
@@ -218,7 +218,7 @@ void CreateCommand::unexecute() {
KBookmark bk = CurrentMgr::bookmarkAt(m_to);
Q_ASSERT(!bk.isNull() && !bk.parentGroup().isNull());
- ListView::self()->invalidate(bk.address());
+ ListView::self()->tqinvalidate(bk.address());
bk.parentGroup().deleteBookmark(bk);
}
@@ -643,13 +643,13 @@ KEBMacroCommand* CmdGen::insertMimeSource(
bool modified = false;
const char *format = 0;
for (int i = 0; format = data->format(i), format; i++) {
- // qt docs don't say if encodedData(blah) where
+ // qt docs don't say if tqencodedData(blah) where
// blah is not a stored mimetype should return null
// or not. so, we search. sucky...
if (strcmp(format, "GALEON_BOOKMARK") == 0) {
modified = true;
TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel");
- mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK"));
+ mydrag->setEncodedData(data->tqencodedData("GALEON_BOOKMARK"));
data = mydrag;
break;
} else if( strcmp(format, "application/x-xbel" )==0) {
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index b9b9b4ea9..3ee09fb35 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -85,7 +85,7 @@ void FavIconsItr::doAction() {
// kdDebug() << "FavIconsItr::doAction()" << endl;
curItem()->setTmpStatus(i18n("Updating favicon..."));
if (!m_updater) {
- m_updater = new FavIconUpdater(kapp, "FavIconUpdater");
+ m_updater = new FavIconUpdater(TQT_TQOBJECT(kapp), "FavIconUpdater");
connect(m_updater, TQT_SIGNAL( done(bool) ),
this, TQT_SLOT( slotDone(bool) ) );
}
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 4df0d237d..3a9a613c1 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -45,7 +45,7 @@ TQString ImportCommand::name() const {
}
TQString ImportCommand::folder() const {
- return m_folder ? i18n("%1 Bookmarks").arg(visibleName()) : TQString::null;
+ return m_folder ? i18n("%1 Bookmarks").arg(visibleName()) : TQString();
}
ImportCommand* ImportCommand::importerFactory(const TQCString &type) {
diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp
index d34794fdc..222b0c89b 100644
--- a/konqueror/keditbookmarks/kbookmarkmerger.cpp
+++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp
@@ -108,7 +108,7 @@ int main( int argc, char**argv )
for ( unsigned int i = 0; i < extraBookmarksDir.count(); ++i ) {
const TQString fileName = extraBookmarksDir[ i ];
- if ( mergedFiles.find( fileName ) != mergedFiles.end() ) {
+ if ( mergedFiles.tqfind( fileName ) != mergedFiles.end() ) {
continue;
}
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 1fa31e967..64ec1d337 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -118,8 +118,8 @@ bool lessAddress(TQString a, TQString b)
if(bLast +1 == bEnd)
return false;
- uint aNext = a.find("/", aLast + 1);
- uint bNext = b.find("/", bLast + 1);
+ uint aNext = a.tqfind("/", aLast + 1);
+ uint bNext = b.tqfind("/", bLast + 1);
bool okay;
uint aNum = a.mid(aLast + 1, aNext - aLast - 1).toUInt(&okay);
@@ -158,12 +158,12 @@ TQValueList<KBookmark> ListView::itemsToBookmarks(const TQValueVector<KEBListVie
return bookmarks;
}
-void ListView::invalidate(const TQString & address)
+void ListView::tqinvalidate(const TQString & address)
{
- invalidate(getItemAtAddress(address));
+ tqinvalidate(getItemAtAddress(address));
}
-void ListView::invalidate(TQListViewItem * item)
+void ListView::tqinvalidate(TQListViewItem * item)
{
if(item->isSelected())
{
@@ -181,7 +181,7 @@ void ListView::invalidate(TQListViewItem * item)
TQListViewItem * child = item->firstChild();
while(child)
{
- //invalidate(child);
+ //tqinvalidate(child);
child = child->nextSibling();
}
}
@@ -218,7 +218,7 @@ void ListView::selected(KEBListViewItem * item, bool s)
if(s)
mSelectedItems[item] = item;
else
- if((it = mSelectedItems.find(item)) != mSelectedItems.end())
+ if((it = mSelectedItems.tqfind(item)) != mSelectedItems.end())
mSelectedItems.remove(it);
KEBApp::self()->updateActions();
@@ -277,7 +277,7 @@ void ListView::deselectAllChildren(KEBListViewItem *item)
else
deselectAllChildren(child);
}
- child->repaint();
+ child->tqrepaint();
child = static_cast<KEBListViewItem *>(child->nextSibling());
}
}
@@ -376,7 +376,7 @@ KEBListViewItem* ListView::getItemAtAddress(const TQString &address) const {
void ListView::setOpen(bool open) {
for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it)
- if (it.current()->parent())
+ if (it.current()->tqparent())
it.current()->setOpen(open);
}
@@ -456,7 +456,7 @@ void ListView::updateListView()
{
KEBListViewItem * item = static_cast<KEBListViewItem*>(m_listView->currentItem());
if(item->isEmptyFolderPadder())
- s_current_address = static_cast<KEBListViewItem*>(item->parent())->bookmark().address();
+ s_current_address = static_cast<KEBListViewItem*>(item->tqparent())->bookmark().address();
else
s_current_address = item->bookmark().address();
}
@@ -483,7 +483,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI
KEBListViewItem *tree = new KEBListViewItem(lv, group);
fillWithGroup(lv, group, tree);
tree->TQListViewItem::setOpen(true);
- if (s_selected_addresses.contains(tree->bookmark().address()))
+ if (s_selected_addresses.tqcontains(tree->bookmark().address()))
lv->setSelected(tree, true);
if(!s_current_address.isNull() && s_current_address == tree->bookmark().address())
lv->setCurrentItem(tree);
@@ -515,7 +515,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI
: new KEBListViewItem(lv, bk));
lastItem = item;
}
- if (s_selected_addresses.contains(bk.address()))
+ if (s_selected_addresses.tqcontains(bk.address()))
lv->setSelected(item, true);
if(!s_current_address.isNull() && s_current_address == bk.address())
lv->setCurrentItem(item);
@@ -804,7 +804,7 @@ TQDragObject *KEBListView::dragObject() {
bool KEBListViewItem::parentSelected(TQListViewItem * item)
{
TQListViewItem *root = item->listView()->firstChild();
- for( TQListViewItem *parent = item->parent(); parent ; parent = parent->parent())
+ for( TQListViewItem *parent = item->tqparent(); parent ; parent = parent->tqparent())
if (parent->isSelected() && parent != root)
return true;
return false;
@@ -814,7 +814,7 @@ void KEBListViewItem::setSelected(bool s)
{
if( isEmptyFolderPadder())
{
- parent()->setSelected(true);
+ tqparent()->setSelected(true);
return;
}
@@ -829,7 +829,7 @@ void KEBListViewItem::setSelected(bool s)
{
ListView::self()->selected(this, false);
TQListViewItem::setSelected( false );
- ListView::deselectAllChildren( this ); //repaints
+ ListView::deselectAllChildren( this ); //tqrepaints
}
else if(parentSelected(this))
return;
@@ -904,7 +904,7 @@ KEBListViewItem::KEBListViewItem(TQListView *parent, TQListViewItem *after, cons
// DESIGN - move this into kbookmark or into a helper
void KEBListViewItem::setOpen(bool open) {
- if (!parent())
+ if (!tqparent())
return;
m_bookmark.internalElement().setAttribute("folded", open ? "no" : "yes");
TQListViewItem::setOpen(open);
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index 0ca0edf38..c05226ff6 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -36,7 +36,7 @@
class TQSplitter;
class KListViewSearchLine;
-class KEBListViewItem : public QListViewItem
+class KEBListViewItem : public TQListViewItem
{
public:
KEBListViewItem(TQListView *, const KBookmarkGroup &);
@@ -56,7 +56,7 @@ public:
void setTmpStatus(const TQString &);
void restoreStatus();
- void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
+ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
void setSelected ( bool s );
virtual void setOpen(bool);
@@ -127,7 +127,7 @@ private:
};
// DESIGN - make some stuff private if possible
-class ListView : public QObject
+class ListView : public TQObject
{
Q_OBJECT
public:
@@ -140,8 +140,8 @@ public:
// selected item stuff
void selected(KEBListViewItem * item, bool s);
- void invalidate(const TQString & address);
- void invalidate(TQListViewItem * item);
+ void tqinvalidate(const TQString & address);
+ void tqinvalidate(TQListViewItem * item);
void fixUpCurrent(const TQString & address);
KEBListViewItem * firstSelected() const;
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 3416e7e0d..9b19ee449 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -67,7 +67,7 @@ static void continueInWindow(TQString _wname) {
for (QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it) {
TQCString &clientId = *it;
- if (qstrncmp(clientId, wname, wname.length()) != 0)
+ if (tqstrncmp(clientId, wname, wname.length()) != 0)
continue;
DCOPRef client(clientId.data(), wname + "-mainwindow#1");
@@ -139,8 +139,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
bool gotArg = (args->count() == 1);
TQString filename = gotArg
- ? TQString::fromLatin1(args->arg(0))
- : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
+ ? TQString::tqfromLatin1(args->arg(0))
+ : locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml"));
if (!isGui) {
CurrentMgr::self()->createManager(filename);
@@ -182,7 +182,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
TQString caption = args->isSet("customcaption")
? TQString::fromLocal8Bit(args->getOption("customcaption"))
- : TQString::null;
+ : TQString();
args->clear();
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 0d7d0ddf8..dd2429ab1 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -107,10 +107,10 @@ void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) {
if (transfer->isErrorPage()) {
TQStringList lines = TQStringList::split('\n', data);
for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) {
- int open_pos = (*it).find("<title>", 0, false);
+ int open_pos = (*it).tqfind("<title>", 0, false);
if (open_pos >= 0) {
TQString leftover = (*it).mid(open_pos + 7);
- int close_pos = leftover.findRev("</title>", -1, false);
+ int close_pos = leftover.tqfindRev("</title>", -1, false);
if (close_pos >= 0) {
// if no end tag found then just
// print the first line of the <title>
@@ -144,7 +144,7 @@ void TestLinkItr::slotJobResult(KIO::Job *job) {
// can we assume that errorString will contain no entities?
TQString jerr = job->errorString();
if (!jerr.isEmpty()) {
- jerr.replace("\n", " ");
+ jerr.tqreplace("\n", " ");
curItem()->nsPut(jerr);
chkErr = false;
}
@@ -166,13 +166,13 @@ void TestLinkItr::slotJobResult(KIO::Job *job) {
/* -------------------------- */
const TQString TestLinkItrHolder::getMod(const TQString &url) const {
- return m_modify.contains(url)
+ return m_modify.tqcontains(url)
? m_modify[url]
: TQString::null;
}
const TQString TestLinkItrHolder::getOldVisit(const TQString &url) const {
- return self()->m_oldModify.contains(url)
+ return self()->m_oldModify.tqcontains(url)
? self()->m_oldModify[url]
: TQString::null;
}
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 4a505d495..ce2d9db58 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -82,7 +82,7 @@ void CmdHistory::slotCommandExecuted(KCommand *k) {
CurrentMgr::self()->notifyManagers(bk.toGroup());
// sets currentItem to something sensible
- // if the currentItem was invalidated by executing
+ // if the currentItem was tqinvalidated by executing
// CreateCommand or DeleteManyCommand
// otherwise does nothing
// sensible is either a already selected item or cmd->currentAddress()
@@ -184,8 +184,8 @@ TQString CurrentMgr::makeTimeStr(int b)
{
TQDateTime dt;
dt.setTime_t(b);
- return (dt.daysTo(TQDateTime::currentDateTime()) > 31)
- ? KGlobal::locale()->formatDate(dt.date(), false)
+ return (dt.daysTo(TQDateTime::tqcurrentDateTime()) > 31)
+ ? KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)
: KGlobal::locale()->formatDateTime(dt, false);
}
@@ -231,13 +231,13 @@ KEBApp::KEBApp(
m_bkinfo = new BookmarkInfoWidget(vsplitter);
- vsplitter->setOrientation(TQSplitter::Vertical);
+ vsplitter->setOrientation(Qt::Vertical);
vsplitter->setSizes(TQValueList<int>() << h << 380
- << m_bkinfo->sizeHint().height() );
+ << m_bkinfo->tqsizeHint().height() );
setCentralWidget(vsplitter);
- resize(ListView::self()->widget()->sizeHint().width(),
- vsplitter->sizeHint().height());
+ resize(ListView::self()->widget()->tqsizeHint().width(),
+ vsplitter->tqsizeHint().height());
createActions();
if (m_browser)
@@ -319,7 +319,7 @@ void KEBApp::slotClipboardDataChanged() {
// kdDebug() << "KEBApp::slotClipboardDataChanged" << endl;
if (!m_readOnly) {
m_canPaste = KBookmarkDrag::canDecode(
- kapp->clipboard()->data(QClipboard::Clipboard));
+ kapp->tqclipboard()->data(QClipboard::Clipboard));
updateActions();
}
}
diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc
index 7cb8a6148..35c5fec83 100644
--- a/konqueror/konq_actions.cc
+++ b/konqueror/konq_actions.cc
@@ -63,7 +63,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList<HistoryEntry> &his
{
TQString text = it.current()->title;
text = KStringHandler::cEmSqueeze(text, popup->fontMetrics(), 30); //CT: squeeze
- text.replace( "&", "&&" );
+ text.tqreplace( "&", "&&" );
if ( checkCurrentItem && it.current() == current )
{
int id = popup->insertItem( text ); // no pixmap if checked
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index 0a73e6c83..9bd39a86e 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -48,10 +48,10 @@ static TQString titleOfURL( const TQString& urlStr )
url.setPath( url.path()+'/' );
historyentry = historylist.findEntry( url );
}
- return ( historyentry ? historyentry->title : TQString::null );
+ return ( historyentry ? historyentry->title : TQString() );
}
-class Q_EXPORT KonqComboListBoxPixmap : public QListBoxItem
+class TQ_EXPORT KonqComboListBoxPixmap : public TQListBoxItem
{
public:
KonqComboListBoxPixmap( const TQString& text );
@@ -95,11 +95,11 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
: KHistoryCombo( parent, name ),
m_returnPressed( false ),
m_permanent( false ),
- m_modifier( NoButton ),
+ m_modifier( Qt::NoButton ),
m_pageSecurity( KonqMainWindow::NotCrypted )
{
setInsertionPolicy( NoInsertion );
- setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
Q_ASSERT( s_config );
@@ -307,7 +307,7 @@ void KonqCombo::updatePixmaps()
updateItem( prov->pixmapFor( text( i ) ), text( i ), i, titleOfURL( text( i ) ) );
}
setUpdatesEnabled( true );
- repaint();
+ tqrepaint();
restoreState();
}
@@ -396,10 +396,10 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev )
// Handle Ctrl+Del/Backspace etc better than the Qt widget, which always
// jumps to the next whitespace.
TQLineEdit *edit = lineEdit();
- if ( o == edit ) {
+ if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(edit) ) {
int type = ev->type();
if ( type == TQEvent::KeyPress ) {
- TQKeyEvent *e = static_cast<TQKeyEvent *>( ev );
+ TQKeyEvent *e = TQT_TQKEYEVENT( ev );
if ( e->key() == Key_Return || e->key() == Key_Enter ) {
m_modifier = e->state();
@@ -459,7 +459,7 @@ void KonqCombo::selectWord(TQKeyEvent *e)
count++;
if( allow_space_break && text[pos].isSpace() && count > 1 )
break;
- } while( pos >= 0 && (chars.findIndex(text[pos]) == -1 || count <= 1) );
+ } while( pos >= 0 && (chars.tqfindIndex(text[pos]) == -1 || count <= 1) );
if( e->state() & ShiftButton ) {
edit->cursorForward(true, 1-count);
@@ -482,7 +482,7 @@ void KonqCombo::selectWord(TQKeyEvent *e)
count++;
if( allow_space_break && text[pos].isSpace() )
break;
- } while( pos < (int) text.length() && chars.findIndex(text[pos]) == -1 );
+ } while( pos < (int) text.length() && chars.tqfindIndex(text[pos]) == -1 );
if( e->state() & ShiftButton ) {
edit->cursorForward(true, count+1);
@@ -537,10 +537,10 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
{
m_dragStart = TQPoint(); // null QPoint
- if ( e->button() == LeftButton && pixmap( currentItem()) ) {
+ if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) {
// check if the pixmap was clicked
int x = e->pos().x();
- int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
+ int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
if ( x > x0 + 2 && x < lineEdit()->x() ) {
m_dragStart = e->pos();
@@ -548,10 +548,10 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
}
}
- if ( e->button() == LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
+ if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
// check if the lock icon was clicked
int x = e->pos().x();
- int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x();
+ int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x();
if ( x < x0 )
emit showPageSecurity();
@@ -566,7 +566,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e )
if ( m_dragStart.isNull() || currentText().isEmpty() )
return;
- if ( e->state() & LeftButton &&
+ if ( e->state() & Qt::LeftButton &&
(e->pos() - m_dragStart).manhattanLength() >
KGlobalSettings::dndEventDelay() )
{
@@ -591,7 +591,7 @@ void KonqCombo::slotActivated( const TQString& text )
applyPermanent();
m_returnPressed = true;
emit activated( text, m_modifier );
- m_modifier = NoButton;
+ m_modifier = Qt::NoButton;
}
void KonqCombo::setConfig( KConfig *kc )
@@ -604,8 +604,8 @@ void KonqCombo::paintEvent( TQPaintEvent *pe )
TQComboBox::paintEvent( pe );
TQLineEdit *edit = lineEdit();
- TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField );
- re = TQStyle::visualRect(re, this);
+ TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField );
+ re = TQStyle::tqvisualRect(re, this);
if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) {
TQColor color(245, 246, 190);
@@ -646,7 +646,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe )
void KonqCombo::setPageSecurity( int pageSecurity )
{
m_pageSecurity = pageSecurity;
- repaint();
+ tqrepaint();
}
bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2)
@@ -701,7 +701,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
title = titleOfURL( text() );
if ( !title.isEmpty() )
pm = KonqPixmapProvider::self()->pixmapFor( text(), KIcon::SizeSmall );
- else if ( text().find( "://" ) == -1 ) {
+ else if ( text().tqfind( "://" ) == -1 ) {
title = titleOfURL( "http://"+text() );
if ( !title.isEmpty() )
pm = KonqPixmapProvider::self()->pixmapFor( "http://"+text(), KIcon::SizeSmall );
@@ -723,8 +723,8 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
pmWidth = pm->width() + 5;
}
- int entryWidth = listBox()->width() - listBox()->style().pixelMetric( TQStyle::PM_ScrollBarExtent ) -
- 2 * listBox()->style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+ int entryWidth = listBox()->width() - listBox()->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) -
+ 2 * listBox()->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
int titleWidth = ( entryWidth / 3 ) - 1;
int urlWidth = entryWidth - titleWidth - pmWidth - 2;
@@ -803,7 +803,7 @@ void KonqComboLineEdit::setCompletedItems( const TQStringList& items )
bool wasSelected = completionbox->isSelected( completionbox->currentItem() );
const TQString currentSelection = completionbox->currentText();
completionbox->setItems( items );
- TQListBoxItem* item = completionbox->findItem( currentSelection, Qt::ExactMatch );
+ TQListBoxItem* item = completionbox->tqfindItem( currentSelection, TQt::ExactMatch );
if( !item || !wasSelected )
{
wasSelected = false;
@@ -824,7 +824,7 @@ void KonqComboLineEdit::setCompletedItems( const TQStringList& items )
}
if ( autoSuggest() ) {
- int index = items.first().find( txt );
+ int index = items.first().tqfind( txt );
TQString newText = items.first().mid( index );
setUserSelection( false );
setCompletedText( newText, true );
@@ -850,7 +850,7 @@ void KonqComboCompletionBox::setItems( const TQStringList& items )
insertStringList( items );
else {
//Keep track of whether we need to change anything,
- //so we can avoid a repaint for identical updates,
+ //so we can avoid a tqrepaint for identical updates,
//to reduce flicker
bool dirty = false;
@@ -884,7 +884,7 @@ void KonqComboCompletionBox::setItems( const TQStringList& items )
triggerUpdate( false );
}
- if ( isVisible() && size().height() != sizeHint().height() )
+ if ( isVisible() && size().height() != tqsizeHint().height() )
sizeAndPosition();
blockSignals( block );
diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc
index d6d9f71a0..93bccfc01 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cc
@@ -100,8 +100,8 @@ void KonqExtensionManager::apply()
setChanged(false);
if( d->mainWindow )
{
- KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, KGlobal::instance());
- TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow);
+ KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, KGlobal::instance());
+ TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(TQT_TQOBJECT(d->mainWindow));
TQPtrListIterator<KParts::Plugin> it(plugins);
KParts::Plugin *plugin;
while((plugin = it.current()) != 0)
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc
index 8dfee7f85..e53b3a32c 100644
--- a/konqueror/konq_factory.cc
+++ b/konqueror/konq_factory.cc
@@ -42,10 +42,10 @@ KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args
: m_factory( factory ), m_args( args ), m_createBrowser( createBrowser )
{
if ( m_createBrowser )
- m_args << TQString::fromLatin1( "Browser/View" );
+ m_args << TQString::tqfromLatin1( "Browser/View" );
}
-KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const char *widgetName,
+KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *tqparentWidget, const char *widgetName,
TQObject * parent, const char *name )
{
if ( !m_factory )
@@ -56,25 +56,25 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha
if ( m_factory->inherits( "KParts::Factory" ) )
{
if ( m_createBrowser )
- obj = static_cast<KParts::Factory *>(m_factory)->createPart( parentWidget, widgetName, parent, name, "Browser/View", m_args );
+ obj = static_cast<KParts::Factory *>(m_factory)->createPart( tqparentWidget, widgetName, parent, name, "Browser/View", m_args );
if ( !obj )
- obj = static_cast<KParts::Factory *>(m_factory)->createPart( parentWidget, widgetName, parent, name, "KParts::ReadOnlyPart", m_args );
+ obj = static_cast<KParts::Factory *>(m_factory)->createPart( tqparentWidget, widgetName, parent, name, "KParts::ReadOnlyPart", m_args );
}
else
{
if ( m_createBrowser )
- obj = m_factory->create( parentWidget, name, "Browser/View", m_args );
+ obj = m_factory->create( TQT_TQOBJECT(tqparentWidget), name, "Browser/View", m_args );
if ( !obj )
- obj = m_factory->create( parentWidget, name, "KParts::ReadOnlyPart", m_args );
+ obj = m_factory->create( TQT_TQOBJECT(tqparentWidget), name, "KParts::ReadOnlyPart", m_args );
}
if ( !obj->inherits( "KParts::ReadOnlyPart" ) )
kdError(1202) << "Part " << obj << " (" << obj->className() << ") doesn't inherit KParts::ReadOnlyPart !" << endl;
KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>( obj );
- TQFrame* frame = ::qt_cast<TQFrame*>( part->widget() );
+ TQFrame* frame = ::tqqt_cast<TQFrame*>( part->widget() );
if (frame)
{
frame->setFrameStyle( TQFrame::NoFrame );
@@ -189,7 +189,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
args = TQStringList::split( " ", argStr );
}
- return KonqViewFactory( factory, args, service->serviceTypes().contains( "Browser/View" ) );
+ return KonqViewFactory( factory, args, service->serviceTypes().tqcontains( "Browser/View" ) );
}
void KonqFactory::getOffers( const TQString & serviceType,
diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h
index ac24061e6..1f7834d64 100644
--- a/konqueror/konq_factory.h
+++ b/konqueror/konq_factory.h
@@ -52,7 +52,7 @@ public:
return *this;
}
- KParts::ReadOnlyPart *create( TQWidget *parentWidget, const char *widgetName,
+ KParts::ReadOnlyPart *create( TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name );
bool isNull() const { return m_factory ? false : true; }
diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc
index ef474a4cb..cda99b291 100644
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cc
@@ -68,20 +68,20 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
setSizeGripEnabled( false );
m_led = new TQLabel( this );
- m_led->setAlignment( Qt::AlignCenter );
- m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
+ m_led->tqsetAlignment( Qt::AlignCenter );
+ m_led->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
addWidget( m_led, 0, false ); // led (active view indicator)
m_led->hide();
m_pStatusLabel = new KSqueezedTextLabel( this );
m_pStatusLabel->setMinimumSize( 0, 0 );
- m_pStatusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
+ m_pStatusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
m_pStatusLabel->installEventFilter(this);
addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label
m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" );
- m_pLinkedViewCheckBox->setFocusPolicy(NoFocus);
- m_pLinkedViewCheckBox->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
+ m_pLinkedViewCheckBox->setFocusPolicy(TQ_NoFocus);
+ m_pLinkedViewCheckBox->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
TQWhatsThis::add( m_pLinkedViewCheckBox,
i18n("Checking this box on at least two views sets those views as 'linked'. "
"Then, when you change directories in one view, the other views "
@@ -151,7 +151,7 @@ void KonqFrameStatusBar::splitFrameMenu()
// We have to ship the remove view action ourselves,
// since this may not be the active view (passive view)
- KAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview");
+ KAction actRemoveView(i18n("Close View"), "view_remove", 0, TQT_TQOBJECT(m_pParentKonqFrame), TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview");
//KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() );
actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() );
@@ -173,15 +173,15 @@ void KonqFrameStatusBar::splitFrameMenu()
bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e)
{
- if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress)
+ if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pStatusLabel) && e->type()==TQEvent::MouseButtonPress)
{
emit clicked();
update();
- if ( static_cast<TQMouseEvent *>(e)->button() == RightButton)
+ if ( TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton)
splitFrameMenu();
return true;
}
- else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange )
+ else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::ApplicationPaletteChange )
{
unsetPalette();
updateActiveStatus();
@@ -274,7 +274,7 @@ void KonqFrameStatusBar::updateActiveStatus()
bool hasFocus = m_pParentKonqFrame->isActivePart();
- const TQColorGroup& activeCg = kapp->palette().active();
+ const TQColorGroup& activeCg = kapp->tqpalette().active();
setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() );
static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) );
@@ -301,7 +301,7 @@ KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer,
// the frame statusbar
m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar");
- m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ m_pStatusBar->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked()));
connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) );
m_separator = 0;
@@ -327,16 +327,16 @@ void KonqFrame::listViews( ChildViewList *viewList )
void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ )
{
if (saveURLs)
- config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ),
+ config->writePathEntry( TQString::tqfromLatin1( "URL" ).prepend( prefix ),
childView()->url().url() );
- config->writeEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() );
- config->writeEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() );
- config->writeEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() );
- config->writeEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() );
- config->writeEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() );
- config->writeEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() );
- //config->writeEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() );
- if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true );
+ config->writeEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() );
+ config->writeEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() );
+ config->writeEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() );
+ config->writeEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() );
+ config->writeEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() );
+ config->writeEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() );
+ //config->writeEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() );
+ if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true );
KonqConfigEvent ev( config, prefix+"_", true/*save*/);
TQApplication::sendEvent( childView()->part(), &ev );
@@ -352,8 +352,8 @@ void KonqFrame::printFrameInfo( const TQString& spaces )
{
TQString className = "NoPart";
if (part()) className = part()->widget()->className();
- kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").arg(isVisible()) << " containing view "
- << childView() << " visible=" << TQString("%1").arg(isVisible())
+ kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").tqarg(isVisible()) << " containing view "
+ << childView() << " visible=" << TQString("%1").tqarg(isVisible())
<< " and part " << part() << " whose widget is a " << className << endl;
}
@@ -397,7 +397,7 @@ bool KonqFrame::eventFilter(TQObject* /*obj*/, TQEvent *ev)
{
if (ev->type()==TQEvent::KeyPress)
{
- TQKeyEvent * keyEv = static_cast<TQKeyEvent*>(ev);
+ TQKeyEvent * keyEv = TQT_TQKEYEVENT(ev);
if ((keyEv->key()==Key_Tab) && (keyEv->state()==ControlButton))
{
emit ((KonqFrameContainer*)parent())->ctrlTabPressed();
@@ -460,7 +460,7 @@ void KonqFrame::slotLinkedViewClicked( bool mode )
void
KonqFrame::paintEvent( TQPaintEvent* )
{
- m_pStatusBar->repaint();
+ m_pStatusBar->tqrepaint();
}
void KonqFrame::slotRemoveView()
@@ -517,40 +517,40 @@ void KonqFrameContainer::saveConfig( KConfig* config, const TQString &prefix, bo
int idSecond = id + (int)pow( 2.0, depth );
//write children sizes
- config->writeEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() );
+ config->writeEntry( TQString::tqfromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() );
//write children
TQStringList strlst;
if( firstChild() )
- strlst.append( TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) );
+ strlst.append( TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) );
if( secondChild() )
- strlst.append( TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) );
+ strlst.append( TQString::tqfromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) );
- config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst );
+ config->writeEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), strlst );
//write orientation
TQString o;
if( orientation() == Qt::Horizontal )
- o = TQString::fromLatin1("Horizontal");
+ o = TQString::tqfromLatin1("Horizontal");
else if( orientation() == Qt::Vertical )
- o = TQString::fromLatin1("Vertical");
- config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o );
+ o = TQString::tqfromLatin1("Vertical");
+ config->writeEntry( TQString::tqfromLatin1( "Orientation" ).prepend( prefix ), o );
//write docContainer
- if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true );
+ if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true );
- if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 1 );
- else config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 0 );
+ if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), 1 );
+ else config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), 0 );
//write child configs
if( firstChild() ) {
- TQString newPrefix = TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1);
+ TQString newPrefix = TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1);
newPrefix.append( '_' );
firstChild()->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + 1 );
}
if( secondChild() ) {
- TQString newPrefix = TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond );
+ TQString newPrefix = TQString::tqfromLatin1( secondChild()->frameType() ) + TQString::number( idSecond );
newPrefix.append( '_' );
secondChild()->saveConfig( config, newPrefix, saveURLs, docContainer, idSecond, depth + 1 );
}
@@ -576,7 +576,7 @@ KonqFrameBase* KonqFrameContainer::otherChild( KonqFrameBase* child )
void KonqFrameContainer::printFrameInfo( const TQString& spaces )
{
- kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").arg(isVisible())
+ kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").tqarg(isVisible())
<< " activeChild=" << m_pActiveChild << endl;
if (!m_pActiveChild)
kdDebug(1202) << "WARNING: " << this << " has a null active child!" << endl;
diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h
index c695515e8..7f3226faf 100644
--- a/konqueror/konq_frame.h
+++ b/konqueror/konq_frame.h
@@ -62,7 +62,7 @@ namespace KParts
* unchecked radiobutton in b2k style if unchecked and contains a little
* anchor if checked.
*/
-class KonqCheckBox : public QCheckBox
+class KonqCheckBox : public TQCheckBox
{
Q_OBJECT // for classname
public:
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc
index 316c88254..d3d3e1bcc 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cc
@@ -152,7 +152,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const
action.setAttribute( "group", "preview" );
(void)new KAction( name, service->pixmap( KIcon::Small ), 0,
- m_mainWindow, TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName );
+ TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName );
}
ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
@@ -191,7 +191,7 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
TQString name = (*cIt)->desktopEntryName();
//kdDebug(1202) << "ToggleViewGUIClient: name=" << name << endl;
KToggleAction *action = new KToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() );
- action->setCheckedState( i18n( "Hide %1" ).arg( (*cIt)->name() ) );
+ action->setCheckedState( i18n( "Hide %1" ).tqarg( (*cIt)->name() ) );
// HACK
if ( (*cIt)->icon() != "unknown" )
@@ -230,7 +230,7 @@ TQPtrList<KAction> ToggleViewGUIClient::actions() const
void ToggleViewGUIClient::slotToggleView( bool toggle )
{
- TQString serviceName = TQString::fromLatin1( sender()->name() );
+ TQString serviceName = TQString::tqfromLatin1( TQT_TQOBJECT_CONST(sender())->name() );
bool horizontal = m_mapOrientation[ serviceName ];
@@ -240,7 +240,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
{
KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal,
- TQString::fromLatin1( "Browser/View" ),
+ TQString::tqfromLatin1( "Browser/View" ),
serviceName,
!horizontal /* vertical = make it first */);
@@ -305,7 +305,7 @@ void ToggleViewGUIClient::saveConfig( bool add, const TQString &serviceName )
TQStringList toggableViewsShown = KonqSettings::toggableViewsShown();
if (add)
{
- if ( !toggableViewsShown.contains( serviceName ) )
+ if ( !toggableViewsShown.tqcontains( serviceName ) )
toggableViewsShown.append(serviceName);
}
else
diff --git a/konqueror/konq_guiclients.h b/konqueror/konq_guiclients.h
index 6dc31b7e9..10e1d495c 100644
--- a/konqueror/konq_guiclients.h
+++ b/konqueror/konq_guiclients.h
@@ -69,7 +69,7 @@ private:
TQDomDocument m_doc;
};
-class ToggleViewGUIClient : public QObject
+class ToggleViewGUIClient : public TQObject
{
Q_OBJECT
public:
diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc
index 3f3e47bc3..67e815522 100644
--- a/konqueror/konq_main.cc
+++ b/konqueror/konq_main.cc
@@ -76,7 +76,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
while ( KonqMainWindow::canBeRestored( n ) )
{
TQString className = KMainWindow::classNameOfToplevel( n );
- if( className == TQString::fromLatin1( "KonqMainWindow" ))
+ if( className == TQString::tqfromLatin1( "KonqMainWindow" ))
(new KonqMainWindow( KURL(), false ) )->restore( n );
else
kdWarning() << "Unknown class " << className << " in session saved data!" << endl;
@@ -93,7 +93,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
it != profiles.end(); ++it)
{
TQString file = *it;
- file = file.mid(file.findRev('/')+1);
+ file = file.mid(file.tqfindRev('/')+1);
printf("%s\n", TQFile::encodeName(file).data());
}
@@ -104,7 +104,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
TQString profile = TQString::fromLocal8Bit(args->getOption("profile"));
TQString profilePath = profile;
if (profile[0] != '/')
- profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile );
+ profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile );
TQString url;
TQStringList filesToSelect;
if (args->count() == 1)
@@ -150,7 +150,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
{
// By default try to open in webbrowser mode. People can use "konqueror ." to get a filemanager.
TQString profile = "webbrowsing";
- TQString profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile );
+ TQString profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile );
if ( !profilePath.isEmpty() ) {
KonqMisc::createBrowserWindowFromProfile( profilePath, profile );
} else {
diff --git a/konqueror/konq_main.h b/konqueror/konq_main.h
index ff72a5181..92dbdd3b2 100644
--- a/konqueror/konq_main.h
+++ b/konqueror/konq_main.h
@@ -13,7 +13,7 @@ public:
closed_by_sm( false ) {}
bool closedByUser() const { return !closed_by_sm; }
- void commitData(QSessionManager& sm) {
+ void commitData(TQSessionManager& sm) {
closed_by_sm = true;
KApplication::commitData( sm );
closed_by_sm = false;
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index ada6c2ef3..ed06539e5 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -143,7 +143,7 @@ KonqExtendedBookmarkOwner::KonqExtendedBookmarkOwner(KonqMainWindow *w)
}
KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, const char *name, const TQString& xmluiFile)
- : KParts::MainWindow( NoDCOPObject, 0L, name, WDestructiveClose | WStyle_ContextHelp | Qt::WGroupLeader )
+ : KParts::MainWindow( NoDCOPObject, 0L, name, (WFlags)(WDestructiveClose | WStyle_ContextHelp | TQt::WGroupLeader) )
{
setPreloadedFlag( false );
@@ -195,7 +195,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
// init history-manager, load history, get completion object
if ( !s_pCompletion ) {
- KonqHistoryManager *mgr = new KonqHistoryManager( kapp, "history mgr" );
+ KonqHistoryManager *mgr = new KonqHistoryManager( TQT_TQOBJECT(kapp), "history mgr" );
s_pCompletion = mgr->completionObject();
@@ -235,7 +235,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) );
if ( !m_toggleViewGUIClient->empty() )
- plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() );
+ plugActionList( TQString::tqfromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() );
else
{
delete m_toggleViewGUIClient;
@@ -342,8 +342,8 @@ KonqMainWindow::~KonqMainWindow()
TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id )
{
- static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" );
- static TQString tagToolBar = TQString::fromLatin1( "ToolBar" );
+ static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" );
+ static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" );
TQWidget *res = KParts::MainWindow::createContainer( parent, index, element, id );
@@ -363,7 +363,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T
m_bookmarkBarActionCollection = new KActionCollection( this );
m_bookmarkBarActionCollection->setHighlightingEnabled( true );
connectActionCollection( m_bookmarkBarActionCollection );
- DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, res );
+ DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, TQT_TQOBJECT(res) );
connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT(initBookmarkBar()) );
}
}
@@ -373,18 +373,18 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T
void KonqMainWindow::initBookmarkBar()
{
- KToolBar * bar = static_cast<KToolBar *>( child( "bookmarkToolBar", "KToolBar" ) );
+ KToolBar * bar = static_cast<KToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "KToolBar" )) );
if (!bar) return;
delete m_paBookmarkBar;
- m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, this );
+ m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, TQT_TQOBJECT(this) );
connect( m_paBookmarkBar,
TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
connect( m_paBookmarkBar,
- TQT_SIGNAL( openBookmark(const TQString &, Qt::ButtonState) ),
- this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, Qt::ButtonState) ));
+ TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ),
+ this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) ));
// hide if empty
if (bar->count() == 0 )
@@ -393,8 +393,8 @@ void KonqMainWindow::initBookmarkBar()
void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id )
{
- static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" );
- static TQString tagToolBar = TQString::fromLatin1( "ToolBar" );
+ static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" );
+ static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" );
if ( element.tagName() == tagToolBar && element.attribute( "name" ) == nameBookmarkBar )
{
@@ -418,7 +418,7 @@ static TQString detectNameFilter( KURL & url )
// Look for wildcard selection
TQString nameFilter;
TQString path = url.path();
- int lastSlash = path.findRev( '/' );
+ int lastSlash = path.tqfindRev( '/' );
if ( lastSlash > -1 )
{
if ( !url.query().isEmpty() && lastSlash == (int)path.length()-1 ) { // In /tmp/?foo, foo isn't a query
@@ -426,7 +426,7 @@ static TQString detectNameFilter( KURL & url )
url.setQuery( TQString::null );
}
const TQString fileName = path.mid( lastSlash + 1 );
- if ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
+ if ( fileName.tqfind( '*' ) != -1 || fileName.tqfind( '[' ) != -1 || fileName.tqfind( '?' ) != -1 )
{
// Check that a file or dir with all the special chars in the filename doesn't exist
if ( url.isLocalFile() ? !TQFile::exists( path ) : !KIO::NetAccess::exists( url, false, 0 ) )
@@ -489,7 +489,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
if (url.url().startsWith("$(")) {
// check for environment variables and make necessary translations
TQString aValue = url.url();
- int nDollarPos = aValue.find( '$' );
+ int nDollarPos = aValue.tqfind( '$' );
while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(aValue.length())) {
// there is at least one $
@@ -511,7 +511,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
}
pclose(fs);
}
- aValue.replace( nDollarPos, nEndPos-nDollarPos, result );
+ aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, result );
} else if( (aValue)[nDollarPos+1] != '$' ) {
uint nEndPos = nDollarPos+1;
// the next character is no $
@@ -537,7 +537,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
// !!! Sergey A. Sukiyazov <[email protected]> !!!
// A environment variables may contain values in 8bit
// locale cpecified encoding or in UTF8 encoding.
- aValue.replace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) );
+ aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) );
} else
aValue.remove( nDollarPos, nEndPos-nDollarPos );
} else {
@@ -545,7 +545,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
aValue.remove( nDollarPos, 1 );
nDollarPos++;
}
- nDollarPos = aValue.find( '$', nDollarPos );
+ nDollarPos = aValue.tqfind( '$', nDollarPos );
}
url = KURL(aValue);
}
@@ -961,15 +961,15 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs
{
kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl;
- KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
+ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() );
TQString frameName = args.frameName;
if ( !frameName.isEmpty() )
{
- static TQString _top = TQString::fromLatin1( "_top" );
- static TQString _self = TQString::fromLatin1( "_self" );
- static TQString _parent = TQString::fromLatin1( "_parent" );
- static TQString _blank = TQString::fromLatin1( "_blank" );
+ static TQString _top = TQString::tqfromLatin1( "_top" );
+ static TQString _self = TQString::tqfromLatin1( "_self" );
+ static TQString _parent = TQString::tqfromLatin1( "_parent" );
+ static TQString _blank = TQString::tqfromLatin1( "_blank" );
if ( frameName.lower() == _blank )
{
@@ -1042,11 +1042,11 @@ void KonqMainWindow::openURL( KonqView *childView, const KURL &url, const KParts
TQObject *KonqMainWindow::lastFrame( KonqView *view )
{
TQObject *nextFrame, *viewFrame;
- nextFrame = view->frame();
+ nextFrame = TQT_TQOBJECT(view->frame());
viewFrame = 0;
while ( nextFrame != 0 && ! nextFrame->inherits( "QWidgetStack" ) ) {
viewFrame = nextFrame;
- nextFrame = nextFrame->parent();
+ nextFrame = nextFrame->tqparent();
}
return nextFrame ? viewFrame : 0L;
}
@@ -1145,7 +1145,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
req.newTabInFront = KonqSettings::newTabsInFront();
req.openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
- if (KApplication::keyboardMouseState() & Qt::ShiftButton)
+ if (KApplication::keyboardMouseState() & TQt::ShiftButton)
req.newTabInFront = !req.newTabInFront;
req.args = args;
openURL( 0L, url, TQString::null, req );
@@ -1171,9 +1171,9 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
{
KParts::BrowserHostExtension *hostExtension = 0;
KParts::ReadOnlyPart *ro_part = 0L;
- KParts::BrowserExtension *be = ::qt_cast<KParts::BrowserExtension *>(sender());
+ KParts::BrowserExtension *be = ::tqqt_cast<KParts::BrowserExtension *>(sender());
if (be)
- ro_part = ::qt_cast<KParts::ReadOnlyPart *>(be->parent());
+ ro_part = ::tqqt_cast<KParts::ReadOnlyPart *>(be->parent());
if ( findChildView( ro_part, args.frameName, &mainWindow, &hostExtension, &part ) )
{
// Found a view. If url isn't empty, we should open it - but this never happens currently
@@ -1234,7 +1234,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
mainWindow->viewManager()->setActivePart( part, true );
}
- TQString profileName = TQString::fromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" );
+ TQString profileName = TQString::tqfromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" );
KSimpleConfig cfg( locate( "data", profileName ), true );
cfg.setGroup( "Profile" );
@@ -1284,7 +1284,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
if ( !windowArgs.resizable )
// ### this doesn't seem to work :-(
- mainWindow->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ mainWindow->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
// Trying to show the window initially behind the current window is a bit tricky,
// as this involves the window manager, which may see things differently.
@@ -1337,12 +1337,12 @@ void KonqMainWindow::slotNewWindow()
if ( profile.isEmpty() )
{
if ( m_currentView && m_currentView->url().protocol().startsWith( "http" ) )
- profile = TQString::fromLatin1("webbrowsing");
+ profile = TQString::tqfromLatin1("webbrowsing");
else
- profile = TQString::fromLatin1("filemanagement");
+ profile = TQString::tqfromLatin1("filemanagement");
}
KonqMisc::createBrowserWindowFromProfile(
- locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ),
+ locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ),
profile );
}
@@ -1491,7 +1491,7 @@ void KonqMainWindow::slotOpenLocation()
void KonqMainWindow::slotToolFind()
{
- kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << sender()->className() << endl;
+ kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << TQT_TQOBJECT_CONST(sender())->className() << endl;
if ( m_currentView && m_currentView->part()->inherits("KonqDirPart") )
{
@@ -1521,7 +1521,7 @@ void KonqMainWindow::slotToolFind()
connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ),
this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) );
}
- else if ( sender()->inherits( "KAction" ) ) // don't go there if called by the singleShot below
+ else if ( TQT_TQOBJECT_CONST(sender())->inherits( "KAction" ) ) // don't go there if called by the singleShot below
{
KURL url;
if ( m_currentView && m_currentView->url().isLocalFile() )
@@ -1529,7 +1529,7 @@ void KonqMainWindow::slotToolFind()
else
url.setPath( TQDir::homeDirPath() );
KonqMainWindow * mw = KonqMisc::createBrowserWindowFromProfile(
- locate( "data", TQString::fromLatin1("konqueror/profiles/filemanagement") ),
+ locate( "data", TQString::tqfromLatin1("konqueror/profiles/filemanagement") ),
"filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ );
mw->m_paFindFiles->setChecked(true);
// Delay it after the openURL call (hacky!)
@@ -1549,7 +1549,7 @@ void KonqMainWindow::slotFindOpen( KonqDirPart * dirPart )
void KonqMainWindow::slotFindClosed( KonqDirPart * dirPart )
{
kdDebug(1202) << "KonqMainWindow::slotFindClosed " << dirPart << endl;
- KonqView * dirView = m_mapViews.find( dirPart ).data();
+ KonqView * dirView = m_mapViews.tqfind( dirPart ).data();
Q_ASSERT(dirView);
kdDebug(1202) << "dirView=" << dirView << endl;
if ( dirView && dirView == m_currentView )
@@ -1570,7 +1570,7 @@ void KonqMainWindow::slotOpenWith()
KURL::List lst;
lst.append( m_currentView->url() );
- TQString serviceName = sender()->name();
+ TQString serviceName = TQT_TQOBJECT_CONST(sender())->name();
KTrader::OfferList offers = m_currentView->appServiceOffers();
KTrader::OfferList::ConstIterator it = offers.begin();
@@ -1588,7 +1588,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
if ( !toggle )
return;
- TQString modeName = sender()->name();
+ TQString modeName = TQT_TQOBJECT_CONST(sender())->name();
if ( m_currentView->service()->desktopEntryName() == modeName )
return;
@@ -1653,7 +1653,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
// current viewmode
TQPtrListIterator<KAction> it( m_toolBarViewModeActions );
for (; it.current(); ++it )
- if ( TQString::fromLatin1( it.current()->name() ) == oldService->desktopEntryName() )
+ if ( TQString::tqfromLatin1( it.current()->name() ) == oldService->desktopEntryName() )
{
assert( it.current()->inherits( "KonqViewModeAction" ) );
@@ -1816,7 +1816,7 @@ void KonqMainWindow::slotReload( KonqView* reloadView )
if ( !reloadView || reloadView->url().isEmpty() )
return;
- if ( reloadView->part() && (reloadView->part()->metaObject()->findProperty("modified") != -1) ) {
+ if ( reloadView->part() && (reloadView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) {
TQVariant prop = reloadView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
@@ -1870,7 +1870,7 @@ void KonqMainWindow::slotReloadPopup()
slotReload( m_pWorkingTab->activeChildView() );
}
-void KonqMainWindow::slotHome(KAction::ActivationReason, Qt::ButtonState state)
+void KonqMainWindow::slotHome(KAction::ActivationReason, TQt::ButtonState state)
{
TQString homeURL = m_pViewManager->profileHomeURL();
@@ -1881,10 +1881,10 @@ void KonqMainWindow::slotHome(KAction::ActivationReason, Qt::ButtonState state)
req.newTab = true;
req.newTabInFront = KonqSettings::newTabsInFront();
- if (state & Qt::ShiftButton)
+ if (state & TQt::ShiftButton)
req.newTabInFront = !req.newTabInFront;
- if( state & Qt::ControlButton ) // Ctrl Left/MMB
+ if( state & TQt::ControlButton ) // Ctrl Left/MMB
openFilteredURL( homeURL, req);
else if( state & Qt::MidButton )
{
@@ -2033,7 +2033,7 @@ void KonqMainWindow::slotConfigureToolbars()
void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply is clicked
{
if ( m_toggleViewGUIClient )
- plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() );
+ plugActionList( TQString::tqfromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() );
if ( m_currentView && m_currentView->appServiceOffers().count() > 0 )
plugActionList( "openwith", m_openWithActions );
@@ -2049,7 +2049,7 @@ void KonqMainWindow::slotUndoAvailable( bool avail )
if ( avail && m_currentView && m_currentView->part() )
{
// Avoid qWarning from TQObject::property if it doesn't exist
- if ( m_currentView->part()->metaObject()->findProperty( "supportsUndo" ) != -1 )
+ if ( m_currentView->part()->tqmetaObject()->tqfindProperty( "supportsUndo" ) != -1 )
{
TQVariant prop = m_currentView->part()->property( "supportsUndo" );
if ( prop.isValid() && prop.toBool() )
@@ -2184,7 +2184,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part )
if ( part )
{
- newView = m_mapViews.find( static_cast<KParts::ReadOnlyPart *>( part ) ).data();
+ newView = m_mapViews.tqfind( static_cast<KParts::ReadOnlyPart *>( part ) ).data();
if ( newView->isPassiveMode() )
{
@@ -2243,7 +2243,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part )
for ( ; it != itEnd ; ++it )
{
- KAction * act = actionCollection()->action( it.key() );
+ KAction * act = actionCollection()->action( static_cast<const char *>(it.key()) );
Q_ASSERT(act);
if (act)
act->setEnabled( false );
@@ -2415,7 +2415,7 @@ void KonqMainWindow::viewsChanged()
KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *view )
{
- MapViews::ConstIterator it = m_mapViews.find( view );
+ MapViews::ConstIterator it = m_mapViews.tqfind( view );
if ( it != m_mapViews.end() )
return it.data();
else
@@ -2666,7 +2666,7 @@ void KonqMainWindow::slotDuplicateTabPopup()
void KonqMainWindow::slotBreakOffTab()
{
if (m_currentView && m_currentView->part() &&
- (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) {
+ (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) {
TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
@@ -2683,7 +2683,7 @@ void KonqMainWindow::slotBreakOffTabPopup()
{
KonqView* originalView = m_currentView;
KonqView *view = m_pWorkingTab->activeChildView();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
+ if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
@@ -2732,7 +2732,7 @@ void KonqMainWindow::slotPopupNewTab()
bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
bool newTabsInFront = KonqSettings::newTabsInFront();
- if (KApplication::keyboardMouseState() & Qt::ShiftButton)
+ if (KApplication::keyboardMouseState() & TQt::ShiftButton)
newTabsInFront = !newTabsInFront;
popupNewTab(newTabsInFront, openAfterCurrentPage);
@@ -2788,7 +2788,7 @@ void KonqMainWindow::openMultiURL( KURL::List url )
void KonqMainWindow::slotRemoveView()
{
if (m_currentView && m_currentView->part() &&
- (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) {
+ (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) {
TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
@@ -2804,7 +2804,7 @@ void KonqMainWindow::slotRemoveView()
void KonqMainWindow::slotRemoveTab()
{
if (m_currentView && m_currentView->part() &&
- (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) {
+ (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) {
TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
@@ -2820,7 +2820,7 @@ void KonqMainWindow::slotRemoveTabPopup()
{
KonqView *originalView = m_currentView;
KonqView *view = m_pWorkingTab->activeChildView();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
+ if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
@@ -2857,7 +2857,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup()
MapViews::ConstIterator end = m_mapViews.end();
for (; it != end; ++it ) {
KonqView *view = it.data();
- if ( view != originalView && view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
+ if ( view != originalView && view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
@@ -2890,7 +2890,7 @@ void KonqMainWindow::slotReloadAllTabs()
MapViews::ConstIterator end = m_mapViews.end();
for (; it != end; ++it ) {
KonqView *view = it.data();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
+ if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
@@ -2923,7 +2923,7 @@ void KonqMainWindow::slotActivatePrevTab()
void KonqMainWindow::slotActivateTab()
{
- m_pViewManager->activateTab( TQString( sender()->name() ).right( 2 ).toInt() -1 );
+ m_pViewManager->activateTab( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 );
}
void KonqMainWindow::slotDumpDebugInfo()
@@ -3103,7 +3103,7 @@ void KonqMainWindow::slotUpAboutToShow()
}
}
-void KonqMainWindow::slotUp(KAction::ActivationReason, Qt::ButtonState state)
+void KonqMainWindow::slotUp(KAction::ActivationReason, TQt::ButtonState state)
{
m_goState = state;
TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) );
@@ -3123,11 +3123,11 @@ void KonqMainWindow::slotUpDelayed()
req.openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
req.newTabInFront = KonqSettings::newTabsInFront();
- if (m_goState & Qt::ShiftButton)
+ if (m_goState & TQt::ShiftButton)
req.newTabInFront = !req.newTabInFront;
const TQString& url = m_currentView->upURL().url();
- if(m_goState & Qt::ControlButton)
+ if(m_goState & TQt::ControlButton)
openFilteredURL(url, req );
else if(m_goState & Qt::MidButton)
{
@@ -3162,7 +3162,7 @@ void KonqMainWindow::slotGoHistoryActivated( int steps )
slotGoHistoryActivated( steps, Qt::LeftButton );
}
-void KonqMainWindow::slotGoHistoryActivated( int steps, Qt::ButtonState state )
+void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state )
{
kdDebug() <<"slotGoHistoryActivated( "<<steps<<", "<<state<<" )"<<endl;
if (!m_goBuffer)
@@ -3181,10 +3181,10 @@ void KonqMainWindow::slotGoHistoryDelayed()
bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
bool mmbOpensTab = KonqSettings::mmbOpensTab();
bool inFront = KonqSettings::newTabsInFront();
- if(m_goState & Qt::ShiftButton)
+ if(m_goState & TQt::ShiftButton)
inFront = !inFront;
- if(m_goState & Qt::ControlButton)
+ if(m_goState & TQt::ControlButton)
{
KonqView * newView = m_pViewManager->addTabFromHistory( m_goBuffer, openAfterCurrentPage );
if (newView && inFront)
@@ -3224,7 +3224,7 @@ void KonqMainWindow::slotBack()
slotGoHistoryActivated(-1);
}
-void KonqMainWindow::slotBack(KAction::ActivationReason, Qt::ButtonState state)
+void KonqMainWindow::slotBack(KAction::ActivationReason, TQt::ButtonState state)
{
slotGoHistoryActivated( -1, state );
}
@@ -3246,7 +3246,7 @@ void KonqMainWindow::slotForward()
slotGoHistoryActivated( 1 );
}
-void KonqMainWindow::slotForward(KAction::ActivationReason, Qt::ButtonState state)
+void KonqMainWindow::slotForward(KAction::ActivationReason, TQt::ButtonState state)
{
slotGoHistoryActivated( 1, state );
}
@@ -3293,7 +3293,7 @@ void KonqMainWindow::initCombo()
if ( !bookmarkCompletionInitialized )
{
bookmarkCompletionInitialized = true;
- DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, m_combo->lineEdit() );
+ DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, TQT_TQOBJECT(m_combo->lineEdit()) );
connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT( bookmarksIntoCompletion() ) );
}
}
@@ -3440,11 +3440,11 @@ void KonqMainWindow::slotClearComboHistory()
bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
{
if ( ( ev->type()==TQEvent::FocusIn || ev->type()==TQEvent::FocusOut ) &&
- m_combo && m_combo->lineEdit() == obj )
+ m_combo && TQT_BASE_OBJECT(m_combo->lineEdit()) == TQT_BASE_OBJECT(obj) )
{
//kdDebug(1202) << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl;
- TQFocusEvent * focusEv = static_cast<TQFocusEvent*>(ev);
+ TQFocusEvent * focusEv = TQT_TQFOCUSEVENT(ev);
if (focusEv->reason() == TQFocusEvent::Popup)
{
return KParts::MainWindow::eventFilter( obj, ev );
@@ -3455,7 +3455,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
ext = m_currentView->browserExtension();
TQStrList slotNames;
if (ext)
- slotNames = ext->metaObject()->slotNames();
+ slotNames = ext->tqmetaObject()->slotNames();
//for ( char * s = slotNames.first() ; s ; s = slotNames.next() )
//{
@@ -3481,16 +3481,16 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) )
duplicate->setEnabled( false );
- if (slotNames.contains("cut()"))
+ if (slotNames.tqcontains("cut()"))
disconnect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) );
- if (slotNames.contains("copy()"))
+ if (slotNames.tqcontains("copy()"))
disconnect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) );
- if (slotNames.contains("paste()"))
+ if (slotNames.tqcontains("paste()"))
disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) );
- if (slotNames.contains("del()"))
+ if (slotNames.tqcontains("del()"))
disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) );
- disconnect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
- this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
+ disconnect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ),
+ this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) );
connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
@@ -3522,16 +3522,16 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) )
duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() );
- if (slotNames.contains("cut()"))
+ if (slotNames.tqcontains("cut()"))
connect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) );
- if (slotNames.contains("copy()"))
+ if (slotNames.tqcontains("copy()"))
connect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) );
- if (slotNames.contains("paste()"))
+ if (slotNames.tqcontains("paste()"))
connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) );
- if (slotNames.contains("del()"))
+ if (slotNames.tqcontains("del()"))
connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) );
- connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
- this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
+ connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ),
+ this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) );
disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
@@ -3564,7 +3564,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
void KonqMainWindow::slotClipboardDataChanged()
{
//kdDebug(1202) << "KonqMainWindow::slotClipboardDataChanged()" << endl;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
m_paPaste->setEnabled( data->provides( "text/plain" ) );
slotCheckComboSelection();
}
@@ -3577,7 +3577,7 @@ void KonqMainWindow::slotCheckComboSelection()
m_paCut->setEnabled( hasSelection );
}
-void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, Qt::ButtonState state )
+void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, TQt::ButtonState state )
{
kdDebug(1202) << "slotClearLocationBar" << endl;
slotStop();
@@ -3798,72 +3798,72 @@ void KonqMainWindow::initActions()
(void) new KAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" );
(void) new KAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" );
- (void) new KAction( i18n( "New &Window" ), "window_new", KStdAccel::shortcut(KStdAccel::New), this, TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" );
- (void) new KAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
- (void) new KAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
- (void) new KAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
+ (void) new KAction( i18n( "New &Window" ), "window_new", KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" );
+ (void) new KAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
+ (void) new KAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
+ (void) new KAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
if (kapp->authorize("shell_access"))
{
- (void) new KAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
+ (void) new KAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
}
- (void) new KAction( i18n( "&Open Location..." ), "fileopen", KStdAccel::shortcut(KStdAccel::Open), this, TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
+ (void) new KAction( i18n( "&Open Location..." ), "fileopen", KStdAccel::shortcut(KStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
- m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), this, TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" );
+ m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" );
m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" );
- (void) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit" );
+ (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" );
- m_ptaUseHTML = new KToggleAction( i18n( "&Use index.html" ), 0, this, TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" );
- m_paLockView = new KToggleAction( i18n( "Lock to Current Location"), 0, this, TQT_SLOT( slotLockView() ), actionCollection(), "lock" );
- m_paLinkView = new KToggleAction( i18n( "Lin&k View"), 0, this, TQT_SLOT( slotLinkView() ), actionCollection(), "link" );
+ m_ptaUseHTML = new KToggleAction( i18n( "&Use index.html" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" );
+ m_paLockView = new KToggleAction( i18n( "Lock to Current Location"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLockView() ), actionCollection(), "lock" );
+ m_paLinkView = new KToggleAction( i18n( "Lin&k View"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLinkView() ), actionCollection(), "link" );
// Go menu
m_paUp = new KToolBarPopupAction( i18n( "&Up" ), "up", KStdAccel::shortcut(KStdAccel::Up), actionCollection(), "up" );
- connect( m_paUp, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
- TQT_SLOT( slotUp(KAction::ActivationReason, Qt::ButtonState) ) );
- connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUpAboutToShow() ) );
- connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUpActivated( int ) ) );
+ connect( m_paUp, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
+ TQT_SLOT( slotUp(KAction::ActivationReason, TQt::ButtonState) ) );
+ connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpAboutToShow() ) );
+ connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotUpActivated( int ) ) );
- QPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
+ TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
m_paBack = new KToolBarPopupAction( backForward.first, KStdAccel::shortcut(KStdAccel::Back), 0, "", actionCollection(), "back" );
- connect( m_paBack, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
- TQT_SLOT( slotBack(KAction::ActivationReason, Qt::ButtonState) ) );
- connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotBackAboutToShow() ) );
- connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotBackActivated( int ) ) );
+ connect( m_paBack, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
+ TQT_SLOT( slotBack(KAction::ActivationReason, TQt::ButtonState) ) );
+ connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotBackAboutToShow() ) );
+ connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotBackActivated( int ) ) );
m_paForward = new KToolBarPopupAction( backForward.second, KStdAccel::shortcut(KStdAccel::Forward), 0, "", actionCollection(), "forward" );
- connect( m_paForward, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
- TQT_SLOT( slotForward(KAction::ActivationReason, Qt::ButtonState) ) );
- connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotForwardAboutToShow() ) );
- connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotForwardActivated( int ) ) );
+ connect( m_paForward, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
+ TQT_SLOT( slotForward(KAction::ActivationReason, TQt::ButtonState) ) );
+ connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardAboutToShow() ) );
+ connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardActivated( int ) ) );
m_paHistory = new KonqBidiHistoryAction( i18n("History"), actionCollection(), "history" );
- connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), this, TQT_SLOT( slotGoMenuAboutToShow() ) );
- connect( m_paHistory, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotGoHistoryActivated( int ) ) );
+ connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotGoMenuAboutToShow() ) );
+ connect( m_paHistory, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotGoHistoryActivated( int ) ) );
m_paHome = new KAction( i18n( "Home" ), "gohome", KStdAccel::shortcut(KStdAccel::Home), actionCollection(), "home" );
- connect( m_paHome, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState) ), this,
- TQT_SLOT( slotHome(KAction::ActivationReason, Qt::ButtonState) ) );
-
- (void) new KAction( i18n( "S&ystem" ), "system", 0, this, TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
- (void) new KAction( i18n( "App&lications" ), "kmenu", 0, this, TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
- (void) new KAction( i18n( "&Storage Media" ), "system", 0, this, TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
- (void) new KAction( i18n( "&Network Folders" ), "network", 0, this, TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
- (void) new KAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
+ connect( m_paHome, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
+ TQT_SLOT( slotHome(KAction::ActivationReason, TQt::ButtonState) ) );
+
+ (void) new KAction( i18n( "S&ystem" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
+ (void) new KAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
+ (void) new KAction( i18n( "&Storage Media" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
+ (void) new KAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
+ (void) new KAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
//(void) new KAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" );
- (void) new KAction( i18n( "Trash" ), "trashcan_full", 0, this, TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" );
- (void) new KAction( i18n( "Autostart" ), 0, this, TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" );
+ (void) new KAction( i18n( "Trash" ), "trashcan_full", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" );
+ (void) new KAction( i18n( "Autostart" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" );
KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" );
connect( mostOften, TQT_SIGNAL( activated( const KURL& )),
TQT_SLOT( slotOpenURL( const KURL& )));
- (void) new KAction( i18n( "History" ), "history", 0, this, TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" );
+ (void) new KAction( i18n( "History" ), "history", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" );
// Settings menu
- m_paSaveViewProfile = new KAction( i18n( "&Save View Profile..." ), 0, this, TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" );
- m_paSaveViewPropertiesLocally = new KToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" );
+ m_paSaveViewProfile = new KAction( i18n( "&Save View Profile..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" );
+ m_paSaveViewPropertiesLocally = new KToggleAction( i18n( "Save View Changes per &Folder" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" );
// "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like...
- m_paRemoveLocalProperties = new KAction( i18n( "Remove Folder Properties" ), 0, this, TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" );
+ m_paRemoveLocalProperties = new KAction( i18n( "Remove Folder Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" );
m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" <<
@@ -3878,38 +3878,38 @@ void KonqMainWindow::initActions()
if (!kapp->authorizeControlModules(configModules()).isEmpty())
- KStdAction::preferences (this, TQT_SLOT (slotConfigure()), actionCollection() );
+ KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotConfigure()), actionCollection() );
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
- KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
+ KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
- m_paConfigureExtensions = new KAction( i18n("Configure Extensions..."), 0, this, TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions");
- m_paConfigureSpellChecking = new KAction( i18n("Configure Spell Checking..."), "spellcheck", 0,this, TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck");
+ m_paConfigureExtensions = new KAction( i18n("Configure Extensions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions");
+ m_paConfigureSpellChecking = new KAction( i18n("Configure Spell Checking..."), "spellcheck", 0,TQT_TQOBJECT(this), TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck");
// Window menu
- m_paSplitViewHor = new KAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" );
- m_paSplitViewVer = new KAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" );
- m_paAddTab = new KAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" );
- m_paDuplicateTab = new KAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" );
- m_paBreakOffTab = new KAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" );
- m_paRemoveView = new KAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" );
- m_paRemoveTab = new KAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" );
- m_paRemoveOtherTabs = new KAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" );
-
- m_paActivateNextTab = new KAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), this, TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" );
- m_paActivatePrevTab = new KAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), this, TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" );
+ m_paSplitViewHor = new KAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" );
+ m_paSplitViewVer = new KAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" );
+ m_paAddTab = new KAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" );
+ m_paDuplicateTab = new KAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" );
+ m_paBreakOffTab = new KAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(this), TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" );
+ m_paRemoveView = new KAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" );
+ m_paRemoveTab = new KAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" );
+ m_paRemoveOtherTabs = new KAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" );
+
+ m_paActivateNextTab = new KAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), TQT_TQOBJECT(this), TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" );
+ m_paActivatePrevTab = new KAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), TQT_TQOBJECT(this), TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" );
TQCString actionname;
for (int i=1;i<13;i++) {
actionname.sprintf("activate_tab_%02d", i);
- new KAction(i18n("Activate Tab %1").arg(i), 0, this, TQT_SLOT(slotActivateTab()), actionCollection(), actionname);
+ new KAction(i18n("Activate Tab %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotActivateTab()), actionCollection(), actionname);
}
- m_paMoveTabLeft = new KAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,this, TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left");
- m_paMoveTabRight = new KAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,this, TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right");
+ m_paMoveTabLeft = new KAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left");
+ m_paMoveTabRight = new KAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right");
#ifndef NDEBUG
- (void) new KAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" );
+ (void) new KAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" );
#endif
m_paSaveRemoveViewProfile = new KAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" );
@@ -3921,14 +3921,14 @@ void KonqMainWindow::initActions()
KShortcut fullScreenShortcut = m_ptaFullScreen->shortcut();
fullScreenShortcut.append( KKey( Key_F11 ) );
m_ptaFullScreen->setShortcut( fullScreenShortcut );
- connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool )));
+ connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool )));
KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload);
reloadShortcut.append(KKey(CTRL + Key_R));
- m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReload() ), actionCollection(), "reload" );
- m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
+ m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
+ m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
- m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
+ m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );
//m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() );
@@ -3943,20 +3943,20 @@ void KonqMainWindow::initActions()
m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" );
m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" );
- m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" );
+ m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" );
m_paRename = new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, actionCollection(), "rename" );
m_paTrash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" );
- connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
- this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
+ connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ),
+ TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) );
m_paDelete = new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" );
- m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
+ m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
// Location bar
m_locationLabel = new KonqDraggableLabel( this, i18n("L&ocation: ") );
- (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" );
+ (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, TQT_TQOBJECT(this), TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" );
m_locationLabel->setBuddy( m_combo );
KWidgetAction* comboAction = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0,
@@ -3970,8 +3970,8 @@ void KonqMainWindow::initActions()
KAction *clearLocation = new KAction( i18n( "Clear Location Bar" ),
TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
CTRL+Key_L, actionCollection(), "clear_location" );
- connect( clearLocation, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
- TQT_SLOT( slotClearLocationBar( KAction::ActivationReason, Qt::ButtonState ) ) );
+ connect( clearLocation, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ),
+ TQT_SLOT( slotClearLocationBar( KAction::ActivationReason, TQt::ButtonState ) ) );
clearLocation->setWhatsThis( i18n( "Clear Location bar<p>"
"Clears the content of the location bar." ) );
@@ -3990,18 +3990,18 @@ void KonqMainWindow::initActions()
TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
connect( m_pBookmarkMenu,
- TQT_SIGNAL( openBookmark(const TQString &, Qt::ButtonState) ),
- this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, Qt::ButtonState) ));
+ TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ),
+ this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) ));
KAction *addBookmark = actionCollection()->action("add_bookmark");
if (addBookmark)
addBookmark->setText(i18n("Bookmark This Location"));
- m_paShowMenuBar = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenuBar() ), actionCollection() );
+ m_paShowMenuBar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenuBar() ), actionCollection() );
- (void) new KAction( i18n( "Kon&queror Introduction" ), 0, this, TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" );
+ (void) new KAction( i18n( "Kon&queror Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" );
- KAction *goUrl = new KAction( i18n( "Go" ), "key_enter", 0, this, TQT_SLOT( goURL() ), actionCollection(), "go_url" );
+ KAction *goUrl = new KAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT( goURL() ), actionCollection(), "go_url" );
goUrl->setWhatsThis( i18n( "Go<p>"
"Goes to the page that has been entered into the location bar." ) );
@@ -4104,7 +4104,7 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, TQPopupMenu * pm
}
}
-void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, Qt::ButtonState state)
+void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, TQt::ButtonState state)
{
kdDebug(1202) << "KonqMainWindow::slotOpenBookmarkURL(" << url << ", " << state << ")" << endl;
@@ -4112,10 +4112,10 @@ void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, Qt::ButtonState
req.newTab = true;
req.newTabInFront = KonqSettings::newTabsInFront();
- if (state & Qt::ShiftButton)
+ if (state & TQt::ShiftButton)
req.newTabInFront = !req.newTabInFront;
- if( state & Qt::ControlButton ) // Ctrl Left/MMB
+ if( state & TQt::ControlButton ) // Ctrl Left/MMB
openFilteredURL( url, req);
else if( state & Qt::MidButton )
{
@@ -4168,9 +4168,9 @@ void KonqMainWindow::updateToolBarActions( bool pendingAction /*=false*/)
if ( m_currentView && m_currentView->url().isLocalFile() &&
!m_currentView->isLockedViewMode() ) {
- if ( m_currentView->serviceTypes().contains( "inode/directory" ) )
+ if ( m_currentView->serviceTypes().tqcontains( "inode/directory" ) )
m_ptaUseHTML->setEnabled( true );
- else if ( m_currentView->serviceTypes().contains( "text/html" ) ) {
+ else if ( m_currentView->serviceTypes().tqcontains( "text/html" ) ) {
// Currently viewing an index.html file via this feature (i.e. url points to a dir)
TQString locPath = KURL( m_currentView->locationBarURL() ).path();
m_ptaUseHTML->setEnabled( TQFileInfo( locPath ).isDir() );
@@ -4269,12 +4269,12 @@ void KonqMainWindow::updateViewActions()
{
// F5 is the default key binding for Reload.... a la Windows.
// mc users want F5 for Copy and F6 for move, but I can't make that default.
- m_paCopyFiles = new KAction( i18n("Copy &Files..."), Key_F7, this, TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
- m_paMoveFiles = new KAction( i18n("M&ove Files..."), Key_F8, this, TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
+ m_paCopyFiles = new KAction( i18n("Copy &Files..."), Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
+ m_paMoveFiles = new KAction( i18n("M&ove Files..."), Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
// This action doesn't appear in the GUI, it's for the shortcut only.
// KNewMenu takes care of the GUI stuff.
- m_paNewDir = new KAction( i18n("Create Folder..." ), Key_F10, this, TQT_SLOT( slotNewDir() ),
+ m_paNewDir = new KAction( i18n("Create Folder..." ), Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ),
actionCollection(), "konq_create_dir" );
TQPtrList<KAction> lst;
@@ -4328,16 +4328,16 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext )
KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin();
KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end();
- TQStrList slotNames = ext->metaObject()->slotNames();
+ TQStrList slotNames = ext->tqmetaObject()->slotNames();
for ( ; it != itEnd ; ++it )
{
- KAction * act = actionCollection()->action( it.key() );
+ KAction * act = actionCollection()->action( static_cast<const char *>(it.key()) );
//kdDebug(1202) << it.key() << endl;
if ( act )
{
// Does the extension have a slot with the name of this action ?
- if ( slotNames.contains( it.key()+"()" ) )
+ if ( slotNames.tqcontains( it.key()+"()" ) )
{
if ( it.key() != "trash" )
connect( act, TQT_SIGNAL( activated() ), ext, it.data() /* TQT_SLOT(slot name) */ );
@@ -4362,13 +4362,13 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext )
KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin();
KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end();
- TQStrList slotNames = ext->metaObject()->slotNames();
+ TQStrList slotNames = ext->tqmetaObject()->slotNames();
for ( ; it != itEnd ; ++it )
{
- KAction * act = actionCollection()->action( it.key() );
+ KAction * act = actionCollection()->action( static_cast<const char *>(it.key()) );
//kdDebug(1202) << it.key() << endl;
- if ( act && slotNames.contains( it.key()+"()" ) )
+ if ( act && slotNames.tqcontains( it.key()+"()" ) )
{
//kdDebug(1202) << "disconnectExtension: " << act << " " << act->name() << endl;
act->disconnect( ext );
@@ -4376,11 +4376,11 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext )
}
}
-void KonqMainWindow::slotTrashActivated( KAction::ActivationReason reason, Qt::ButtonState state )
+void KonqMainWindow::slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state )
{
if ( !m_currentView )
return;
- if ( reason == KAction::PopupMenuActivation && ( state & Qt::ShiftButton ) )
+ if ( reason == KAction::PopupMenuActivation && ( state & TQt::ShiftButton ) )
m_currentView->callExtensionMethod( "del()" );
else
m_currentView->callExtensionMethod( "trash()" );
@@ -4444,7 +4444,7 @@ void KonqMainWindow::enableAllActions( bool enable )
{
KAction *act = *it;
if ( !TQString(act->name()).startsWith("options_configure") /* do not touch the configureblah actions */
- && ( !enable || !actionSlotMap->contains( act->name() ) ) ) /* don't enable BE actions */
+ && ( !enable || !actionSlotMap->tqcontains( act->name() ) ) ) /* don't enable BE actions */
act->setEnabled( enable );
}
// This method is called with enable=false on startup, and
@@ -4655,7 +4655,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
{
KonqView * m_oldView = m_currentView;
- KonqView * currentView = childView( static_cast<KParts::ReadOnlyPart *>( sender()->parent() ) );
+ KonqView * currentView = childView( static_cast<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() ) );
//kdDebug() << "KonqMainWindow::slotPopupMenu m_oldView=" << m_oldView << " new currentView=" << currentView << " passive:" << currentView->isPassiveMode() << endl;
@@ -4696,7 +4696,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
popupMenuCollection.insert( m_paDelete );
// The pasteto action is used when clicking on a dir, to paste into it.
- KAction *actPaste = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" );
+ KAction *actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" );
actPaste->setEnabled( m_paPaste->isEnabled() );
popupMenuCollection.insert( actPaste );
@@ -4749,7 +4749,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
//firstURL.cleanPath();
openedForViewURL = firstURL.equals( viewURL, true );
}
- devicesFile = firstURL.protocol().find("device", 0, false) == 0;
+ devicesFile = firstURL.protocol().tqfind("device", 0, false) == 0;
//dirsSelected = S_ISDIR( _items.getFirst()->mode() );
}
//check if current url is trash
@@ -4769,10 +4769,10 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
if( doTabHandling )
{
if (_args.forcesNewWindow()) {
- actNewWindow = new KAction( i18n( "Open in T&his Window" ), 0, this, TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
+ actNewWindow = new KAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
actNewWindow->setToolTip( i18n( "Open the document in current window" ) );
}
- actNewWindow = new KAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
+ actNewWindow = new KAction( i18n( "Open in New &Window" ), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
actNewWindow->setToolTip( i18n( "Open the document in a new window" ) );
//Set tab_new_x to point to the correct icon based on NewTabsInFront
@@ -4783,7 +4783,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
else
tab_new_x = "tab_new_bg" ;
- actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
+ actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
actNewTab->setToolTip( i18n( "Open the document in a new tab" ) );
doTabHandling = true;
}
@@ -4823,7 +4823,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
if ( client )
pPopupMenu->factory()->addClient( client );
- KParts::BrowserExtension *be = ::qt_cast<KParts::BrowserExtension *>(sender());
+ KParts::BrowserExtension *be = ::tqqt_cast<KParts::BrowserExtension *>(sender());
if ( be )
{
@@ -4835,7 +4835,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
TQObject::disconnect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()),
this, TQT_SLOT(slotFileNewAboutToShow()) );
- TQGuardedPtr<TQObject> guard(this); // #149736
+ TQGuardedPtr<TQObject> guard(TQT_TQOBJECT(this)); // #149736
pPopupMenu->exec( _global );
delete pPopupMenu;
@@ -4889,8 +4889,8 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
m_currentView = m_oldView;
}
// Special case: RMB + renaming in sidebar; setFocus would abort editing.
- TQWidget* fw = focusWidget();
- if ( !fw || !::qt_cast<TQLineEdit*>( fw ) )
+ TQWidget* fw = tqfocusWidget();
+ if ( !fw || !::tqqt_cast<TQLineEdit*>( fw ) )
m_oldView->part()->widget()->setFocus();
}
}
@@ -4901,7 +4901,7 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items )
TQPtrListIterator<KFileItem> it( items );
for ( ; it.current(); ++it )
{
- if ( popupItems.contains( it.current() ) )
+ if ( popupItems.tqcontains( it.current() ) )
{
emit popupItemsDisturbed();
return;
@@ -4911,7 +4911,7 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items )
void KonqMainWindow::slotOpenEmbedded()
{
- TQCString name = sender()->name();
+ TQCString name = TQT_TQOBJECT_CONST(sender())->name();
m_popupService = m_popupEmbeddingServices[ name.toInt() ]->desktopEntryName();
@@ -5068,7 +5068,7 @@ void KonqMainWindow::updateViewModeActions()
// make sure to also clear our [libiconview,liblistview]->service-for-viewmode
// map
if ( m_viewModeToolBarServices.count() > 0 &&
- !m_viewModeToolBarServices.begin().data()->serviceTypes().contains( m_currentView->serviceType() ) )
+ !m_viewModeToolBarServices.begin().data()->serviceTypes().tqcontains( m_currentView->serviceType() ) )
{
// Save the current map to the config file, for later reuse
saveToolBarServicesMap();
@@ -5081,7 +5081,7 @@ void KonqMainWindow::updateViewModeActions()
if ( services.count() <= 1 )
return;
- m_viewModeMenu = new KActionMenu( i18n( "&View Mode" ), this );
+ m_viewModeMenu = new KActionMenu( i18n( "&View Mode" ), TQT_TQOBJECT(this) );
// a temporary map, just like the m_viewModeToolBarServices map, but
// mapping to a KonqViewModeAction object. It's just temporary as we
@@ -5112,11 +5112,11 @@ void KonqMainWindow::updateViewModeActions()
itname = (*it)->name();
TQString icon = (*it)->icon();
- if ( icon != TQString::fromLatin1( "unknown" ) )
+ if ( icon != TQString::tqfromLatin1( "unknown" ) )
// we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon)
- action = new KRadioAction( itname, icon, 0, this, (*it)->desktopEntryName().ascii() );
+ action = new KRadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() );
else
- action = new KRadioAction( itname, 0, this, (*it)->desktopEntryName().ascii() );
+ action = new KRadioAction( itname, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() );
action->setExclusiveGroup( "KonqMainWindow_ViewModes" );
@@ -5130,7 +5130,7 @@ void KonqMainWindow::updateViewModeActions()
// look if we already have a KonqViewModeAction (in the toolbar)
// for this component
- TQMap<TQString,KonqViewModeAction*>::Iterator mapIt = groupedServiceMap.find( library );
+ TQMap<TQString,KonqViewModeAction*>::Iterator mapIt = groupedServiceMap.tqfind( library );
// if we don't have -> create one
if ( mapIt == groupedServiceMap.end() )
@@ -5144,7 +5144,7 @@ void KonqMainWindow::updateViewModeActions()
// if we previously changed the viewmode (see slotViewModeToggle!)
// then we will want to use the previously used settings (previous as
// in before the actions got deleted)
- TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.find( library );
+ TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.tqfind( library );
if ( serviceIt != m_viewModeToolBarServices.end() )
{
kdDebug(1202) << " Setting action for " << library << " to " << (*serviceIt)->name() << endl;
@@ -5168,7 +5168,7 @@ void KonqMainWindow::updateViewModeActions()
KonqViewModeAction *tbAction = new KonqViewModeAction( text,
icon,
- this,
+ TQT_TQOBJECT(this),
name );
tbAction->setExclusiveGroup( "KonqMainWindow_ToolBarViewModes" );
@@ -5193,7 +5193,7 @@ void KonqMainWindow::updateViewModeActions()
// Set the contents of the button from the current service, either if it's the current view
// or if it's our preferred service for this button (library)
if ( bIsCurrentView
- || ( preferredServiceMap.contains( library ) && (*it)->desktopEntryName() == preferredServiceMap[ library ] ) )
+ || ( preferredServiceMap.tqcontains( library ) && (*it)->desktopEntryName() == preferredServiceMap[ library ] ) )
{
//kdDebug(1202) << " Changing action for " << library << " into service " << (*it)->name() << endl;
@@ -5260,7 +5260,7 @@ KonqMainWindowIface* KonqMainWindow::dcopObject()
void KonqMainWindow::updateBookmarkBar()
{
- KToolBar * bar = static_cast<KToolBar *>( child( "bookmarkToolBar", "KToolBar" ) );
+ KToolBar * bar = static_cast<KToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "KToolBar" )) );
if (!bar) return;
@@ -5283,7 +5283,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
if ( tabContainer->count() > 1 )
{
KConfig *config = KGlobal::config();
- KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") );
+ KConfigGroupSaver cs( config, TQString::tqfromLatin1("Notification Messages") );
if ( !config->hasKey( "MultipleTabConfirm" ) )
{
@@ -5321,7 +5321,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
MapViews::ConstIterator end = m_mapViews.end();
for (; it != end; ++it ) {
KonqView *view = it.data();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
+ if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
@@ -5339,7 +5339,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
// m_pViewManager->showTab( originalView );
}
else if ( m_currentView && m_currentView->part() &&
- (m_currentView->part()->metaObject()->findProperty("modified") != -1) )
+ (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) )
{
TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
@@ -5356,7 +5356,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
saveWindowSize();
hide();
- qApp->flushX();
+ tqApp->flushX();
}
// We're going to close - tell the parts
MapViews::ConstIterator it = m_mapViews.begin();
@@ -5571,7 +5571,7 @@ static void hp_removeDuplicates( KCompletionMatches& l )
++it ) {
TQString str = (*it).value();
if( str.startsWith( http )) {
- if( str.find( '/', 7 ) < 0 ) { // http://something<noslash>
+ if( str.tqfind( '/', 7 ) < 0 ) { // http://something<noslash>
hp_removeDupe( l, str + '/', it );
hp_removeDupe( l, str.mid( 7 ) + '/', it );
} else if( str[ str.length() - 1 ] == '/' ) {
@@ -5684,7 +5684,7 @@ TQStringList KonqMainWindow::historyPopupCompletionItems( const TQString& s)
hp_removeDuplicates( matches );
TQStringList items = matches.list();
if( items.count() == 0
- && !s.contains( ':' ) && s[ 0 ] != '/' )
+ && !s.tqcontains( ':' ) && s[ 0 ] != '/' )
{
TQString pre = hp_tryPrepend( s );
if( !pre.isNull())
@@ -5794,7 +5794,7 @@ void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window )
if( window == NULL )
return;
window->viewManager()->clear();
- KIO::Scheduler::unregisterWindow( window );
+ KIO::Scheduler::unregisterWindow( TQT_TQOBJECT(window) );
}
// used by preloading - this KonqMainWindow will be reused, reset everything
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index 9ee5b7e19..f5068d98f 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -335,7 +335,7 @@ public slots:
// for KBookmarkMenu and KBookmarkBar
void slotFillContextMenu( const KBookmark &, TQPopupMenu * );
- void slotOpenBookmarkURL( const TQString & url, Qt::ButtonState state );
+ void slotOpenBookmarkURL( const TQString & url, TQt::ButtonState state );
void slotPopupMenu( const TQPoint &_global, const KURL &_url, const TQString &_mimeType, mode_t mode );
void slotPopupMenu( KXMLGUIClient *client, const TQPoint &_global, const KURL &_url, const TQString &_mimeType, mode_t mode );
@@ -381,14 +381,14 @@ public slots:
// Go menu
void slotUp();
- void slotUp(KAction::ActivationReason, Qt::ButtonState state);
+ void slotUp(KAction::ActivationReason, TQt::ButtonState state);
void slotUpDelayed();
void slotBack();
- void slotBack(KAction::ActivationReason, Qt::ButtonState state);
+ void slotBack(KAction::ActivationReason, TQt::ButtonState state);
void slotForward();
- void slotForward(KAction::ActivationReason, Qt::ButtonState state);
+ void slotForward(KAction::ActivationReason, TQt::ButtonState state);
void slotHome();
- void slotHome(KAction::ActivationReason, Qt::ButtonState state);
+ void slotHome(KAction::ActivationReason, TQt::ButtonState state);
void slotGoSystem();
void slotGoApplications();
void slotGoMedia();
@@ -410,7 +410,7 @@ public slots:
void slotPartChanged( KonqView *childView, KParts::ReadOnlyPart *oldPart, KParts::ReadOnlyPart *newPart );
void slotRunFinished();
- void slotClearLocationBar( KAction::ActivationReason reason, Qt::ButtonState state );
+ void slotClearLocationBar( KAction::ActivationReason reason, TQt::ButtonState state );
// reimplement from KParts::MainWindow
virtual void slotSetStatusBarText( const TQString &text );
@@ -420,7 +420,7 @@ public slots:
virtual void setIcon( const TQPixmap& );
void slotGoHistoryActivated( int steps );
- void slotGoHistoryActivated( int steps, Qt::ButtonState state );
+ void slotGoHistoryActivated( int steps, TQt::ButtonState state );
void slotAddTab();
void slotSplitViewHorizontal();
@@ -556,7 +556,7 @@ private slots:
void bookmarksIntoCompletion();
void initBookmarkBar();
- void slotTrashActivated( KAction::ActivationReason reason, Qt::ButtonState state );
+ void slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state );
void showPageSecurity();
@@ -689,7 +689,7 @@ private:
uint m_bViewModeToggled:1;
int m_goBuffer;
- Qt::ButtonState m_goState;
+ TQt::ButtonState m_goState;
MapViews m_mapViews;
diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc
index 66aeaba41..d0bf5e788 100644
--- a/konqueror/konq_misc.cc
+++ b/konqueror/konq_misc.cc
@@ -106,7 +106,7 @@ KonqMainWindow * KonqMisc::createNewWindow( const KURL &url, const KParts::URLAr
KMimeType::findByURL(url)->name() == "text/html")
? "webbrowsing" : "filemanagement";
- TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName );
+ TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName );
return createBrowserWindowFromProfile(profile, profileName,
url, args,
forbidUseHTML, filesToSelect, tempFile, openURL );
@@ -224,9 +224,9 @@ KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text
: TQLabel( text, 0L, "kde toolbar widget" ) // Use this name for it to be styled!
, m_mw(mw)
{
- setBackgroundMode( Qt::PaletteButton );
- setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
- Qt::AlignVCenter | Qt::ShowPrefix );
+ setBackgroundMode( TQt::PaletteButton );
+ tqsetAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
+ Qt::AlignVCenter | TQt::ShowPrefix );
setAcceptDrops(true);
adjustSize();
validDrag = false;
diff --git a/konqueror/konq_misc.h b/konqueror/konq_misc.h
index 9696151e6..bab4ca853 100644
--- a/konqueror/konq_misc.h
+++ b/konqueror/konq_misc.h
@@ -109,7 +109,7 @@ public:
#include <tqlabel.h>
-class KonqDraggableLabel : public QLabel
+class KonqDraggableLabel : public TQLabel
{
Q_OBJECT
public:
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 2a3547068..33f36945f 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@@ -104,7 +104,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese
TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) );
loadAllProfiles( preselectProfile );
- m_pListView->setMinimumSize( m_pListView->sizeHint() );
+ m_pListView->setMinimumSize( m_pListView->tqsizeHint() );
m_cbSaveURLs = new TQCheckBox( i18n("Save &URLs in profile"), box );
m_cbSaveURLs->setChecked( KonqSettings::saveURLInProfile() );
@@ -121,7 +121,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese
enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 );
enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 );
- resize( sizeHint() );
+ resize( tqsizeHint() );
}
KonqProfileDlg::~KonqProfileDlg()
@@ -141,7 +141,7 @@ void KonqProfileDlg::loadAllProfiles(const TQString & preselectProfile)
for (; eIt != eEnd; ++eIt )
{
TQListViewItem *item = new KonqProfileItem( m_pListView, eIt.key() );
- TQString filename = eIt.data().mid( eIt.data().findRev( '/' ) + 1 );
+ TQString filename = eIt.data().mid( eIt.data().tqfindRev( '/' ) + 1 );
kdDebug(1202) << filename << endl;
if ( filename == preselectProfile )
{
@@ -161,7 +161,7 @@ void KonqProfileDlg::slotUser3() // Save button
// Reuse filename of existing item, if any
if ( m_pListView->selectedItem() )
{
- KonqProfileMap::Iterator it = m_mapEntries.find( m_pListView->selectedItem()->text(0) );
+ KonqProfileMap::Iterator it = m_mapEntries.tqfind( m_pListView->selectedItem()->text(0) );
if ( it != m_mapEntries.end() )
{
TQFileInfo info( it.data() );
@@ -180,7 +180,7 @@ void KonqProfileDlg::slotUser2() // Delete button
{
if(!m_pListView->selectedItem())
return;
- KonqProfileMap::Iterator it = m_mapEntries.find( m_pListView->selectedItem()->text(0) );
+ KonqProfileMap::Iterator it = m_mapEntries.tqfind( m_pListView->selectedItem()->text(0) );
if ( it != m_mapEntries.end() && TQFile::remove( it.data() ) )
loadAllProfiles();
@@ -206,7 +206,7 @@ void KonqProfileDlg::slotItemRenamed( TQListViewItem * item )
if (!newName.isEmpty())
{
- KonqProfileMap::ConstIterator it = m_mapEntries.find( oldName );
+ KonqProfileMap::ConstIterator it = m_mapEntries.tqfind( oldName );
if ( it != m_mapEntries.end() )
{
diff --git a/konqueror/konq_profiledlg.h b/konqueror/konq_profiledlg.h
index f06f6a1fe..ffdd3d513 100644
--- a/konqueror/konq_profiledlg.h
+++ b/konqueror/konq_profiledlg.h
@@ -35,7 +35,7 @@ class KListView;
typedef TQMap<TQString, TQString> KonqProfileMap;
-class KonqProfileItem : public QListViewItem
+class KonqProfileItem : public TQListViewItem
{
public:
KonqProfileItem( KListView *, const TQString & );
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index 3cc5cc60d..09d1a0b53 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -196,16 +196,16 @@ void KonqFrameTabs::saveConfig( KConfig* config, const TQString &prefix, bool sa
TQString newPrefix;
for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next())
{
- newPrefix = TQString::fromLatin1( it->frameType() ) + "T" + TQString::number(i);
+ newPrefix = TQString::tqfromLatin1( it->frameType() ) + "T" + TQString::number(i);
strlst.append( newPrefix );
newPrefix.append( '_' );
it->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + i );
i++;
}
- config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst );
+ config->writeEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), strlst );
- config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ),
+ config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ),
currentPageIndex() );
}
@@ -225,7 +225,7 @@ void KonqFrameTabs::copyHistory( KonqFrameBase *other )
void KonqFrameTabs::printFrameInfo( const TQString& spaces )
{
kdDebug(1202) << spaces << "KonqFrameTabs " << this << " visible="
- << TQString("%1").arg(isVisible()) << " activeChild="
+ << TQString("%1").tqarg(isVisible()) << " activeChild="
<< m_pActiveChild << endl;
if (!m_pActiveChild)
@@ -440,7 +440,7 @@ void KonqFrameTabs::slotSubPopupMenuTabActivated( int _id)
void KonqFrameTabs::slotMouseMiddleClick()
{
- TQApplication::clipboard()->setSelectionMode( QClipboard::Selection );
+ TQApplication::tqclipboard()->setSelectionMode( QClipboard::Selection );
KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
if ( !filteredURL.isEmpty() ) {
KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false);
@@ -461,7 +461,7 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w )
}
}
else {
- TQApplication::clipboard()->setSelectionMode( QClipboard::Selection );
+ TQApplication::tqclipboard()->setSelectionMode( QClipboard::Selection );
KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
if ( !filteredURL.isEmpty() ) {
KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w);
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index b27779a4e..e7f1bd7bf 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -45,7 +45,7 @@
#include <tqmetaobject.h>
#include <tqobjectlist.h>
#include <config.h>
-#include <private/qucomextra_p.h>
+#include <tqucomextra_p.h>
#include <kmessagebox.h>
#include <klocale.h>
@@ -117,7 +117,7 @@ KonqView::~KonqView()
if (part_url.isNull())
part_url = "";
TQCString line;
- line = ( TQString("close(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8();
+ line = ( TQString("close(%1):%2\n").tqarg(m_randID,0,16).tqarg(part_url) ).utf8();
KonqMainWindow::s_crashlog_file->writeBlock(line, line.length());
KonqMainWindow::s_crashlog_file->flush();
}
@@ -155,9 +155,9 @@ void KonqView::openURL( const KURL &url, const TQString & locationBarURL,
TQCString line;
- line = ( TQString("closed(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8();
+ line = ( TQString("closed(%1):%2\n").tqarg(m_randID,0,16).tqarg(part_url) ).utf8();
KonqMainWindow::s_crashlog_file->writeBlock(line,line.length());
- line = ( TQString("opened(%3):%4\n").arg(m_randID,0,16).arg(url_url) ).utf8();
+ line = ( TQString("opened(%3):%4\n").tqarg(m_randID,0,16).tqarg(url_url) ).utf8();
KonqMainWindow::s_crashlog_file->writeBlock(line,line.length());
KonqMainWindow::s_crashlog_file->flush();
}
@@ -528,8 +528,8 @@ void KonqView::slotStarted( KIO::Job * job )
// Manage passwords properly...
if (m_pMainWindow)
{
- kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->topLevelWidget()->winId() << endl;
- job->setWindow (m_pMainWindow->topLevelWidget ());
+ kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->tqtopLevelWidget()->winId() << endl;
+ job->setWindow (m_pMainWindow->tqtopLevelWidget ());
}
connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) );
@@ -1056,7 +1056,7 @@ KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *par
if ( !ext )
return 0;
- if ( ext->frameNames().contains( name ) )
+ if ( ext->frameNames().tqcontains( name ) )
return ext;
const TQPtrList<KParts::ReadOnlyPart> children = ext->frames();
@@ -1077,10 +1077,10 @@ bool KonqView::callExtensionMethod( const char *methodName )
if ( !obj ) // not all views have a browser extension !
return false;
- int id = obj->metaObject()->findSlot( methodName );
+ int id = obj->tqmetaObject()->tqfindSlot( methodName );
if ( id == -1 )
return false;
- QUObject o[ 1 ];
+ TQUObject o[ 1 ];
obj->qt_invoke( id, o );
return true;
@@ -1092,12 +1092,12 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value )
if ( !obj ) // not all views have a browser extension !
return false;
- int id = obj->metaObject()->findSlot( methodName );
+ int id = obj->tqmetaObject()->tqfindSlot( methodName );
if ( id == -1 )
return false;
- QUObject o[ 2 ];
+ TQUObject o[ 2 ];
- static_QUType_bool.set( o + 1, value );
+ static_TQUType_bool.set( o + 1, value );
obj->qt_invoke( id, o );
return true;
@@ -1109,12 +1109,12 @@ bool KonqView::callExtensionStringMethod( const char *methodName, TQString value
if ( !obj ) // not all views have a browser extension !
return false;
- int id = obj->metaObject()->findSlot( methodName );
+ int id = obj->tqmetaObject()->tqfindSlot( methodName );
if ( id == -1 )
return false;
- QUObject o[ 2 ];
+ TQUObject o[ 2 ];
- static_QUType_QString.set( o + 1, value );
+ static_TQUType_TQString.set( o + 1, value );
obj->qt_invoke( id, o );
return true;
@@ -1126,12 +1126,12 @@ bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value
if ( !obj ) // not all views have a browser extension !
return false;
- int id = obj->metaObject()->findSlot( methodName );
+ int id = obj->tqmetaObject()->tqfindSlot( methodName );
if ( id == -1 )
return false;
- QUObject o[ 2 ];
+ TQUObject o[ 2 ];
- static_QUType_ptr.set( o + 1, &value );
+ static_TQUType_ptr.set( o + 1, &value );
obj->qt_invoke( id, o );
return true;
@@ -1146,7 +1146,7 @@ void KonqView::setViewName( const TQString &name )
TQString KonqView::viewName() const
{
- return m_pPart ? TQString::fromLocal8Bit( m_pPart->name() ) : TQString::null;
+ return m_pPart ? TQString::fromLocal8Bit( m_pPart->name() ) : TQString();
}
void KonqView::enablePopupMenu( bool b )
@@ -1256,7 +1256,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
if ( !m_pPart )
return false;
// kdDebug() << "--" << obj->className() << "--" << e->type() << "--" << endl;
- if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() )
+ if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) )
{
TQDragEnterEvent *ev = static_cast<TQDragEnterEvent *>( e );
@@ -1268,16 +1268,16 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
TQObjectList *children = m_pPart->widget()->queryList( "TQWidget" );
if ( ok &&
- !lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me
+ !lstDragURLs.first().url().tqcontains( "javascript:", false ) && // ### this looks like a hack to me
ev->source() != m_pPart->widget() &&
children &&
- children->findRef( ev->source() ) == -1 )
+ children->tqfindRef( TQT_TQOBJECT(ev->source()) ) == -1 )
ev->acceptAction();
delete children;
}
}
- else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() )
+ else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) )
{
TQDropEvent *ev = static_cast<TQDropEvent *>( e );
@@ -1293,7 +1293,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
{
if ( e->type() == TQEvent::ContextMenu )
{
- TQContextMenuEvent *ev = static_cast<TQContextMenuEvent *>( e );
+ TQContextMenuEvent *ev = TQT_TQCONTEXTMENUEVENT( e );
if ( ev->reason() == TQContextMenuEvent::Mouse )
{
return true;
@@ -1301,16 +1301,16 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
}
else if ( e->type() == TQEvent::MouseButtonPress )
{
- TQMouseEvent *ev = static_cast<TQMouseEvent *>( e );
- if ( ev->button() == RightButton )
+ TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
+ if ( ev->button() == Qt::RightButton )
{
return true;
}
}
else if ( e->type() == TQEvent::MouseButtonRelease )
{
- TQMouseEvent *ev = static_cast<TQMouseEvent *>( e );
- if ( ev->button() == RightButton )
+ TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
+ if ( ev->button() == Qt::RightButton )
{
emit backRightClick();
return true;
@@ -1318,8 +1318,8 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
}
else if ( e->type() == TQEvent::MouseMove )
{
- TQMouseEvent *ev = static_cast<TQMouseEvent *>( e );
- if ( ev->state() == RightButton )
+ TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
+ if ( ev->state() == Qt::RightButton )
{
obj->removeEventFilter( this );
TQMouseEvent me( TQEvent::MouseButtonPress, ev->pos(), 2, 2 );
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 28f2568d9..1329000f8 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -62,7 +62,7 @@ struct HistoryEntry
* handles it. It's more or less the backend structure for the views.
* The widget handling stuff is done by the KonqFrame.
*/
-class KonqView : public QObject
+class KonqView : public TQObject
{
Q_OBJECT
public:
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index c4f03da75..86fb3d478 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -423,7 +423,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag
KConfig config( tempFile.name() );
config.setGroup( "View Profile" );
- TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0);
+ TQString prefix = TQString::tqfromLatin1( currentFrame->frameType() ) + TQString::number(0);
config.writeEntry( "RootItem", prefix );
prefix.append( '_' );
currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1);
@@ -493,10 +493,10 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab )
KConfig config( tempFile.name() );
config.setGroup( "View Profile" );
- TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0);
+ TQString prefix = TQString::tqfromLatin1( currentFrame->frameType() ) + TQString::number(0);
config.writeEntry( "RootItem", prefix );
prefix.append( '_' );
- config.writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true );
+ config.writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true );
currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1);
KonqMainWindow *mainWindow = new KonqMainWindow( KURL(), false );
@@ -1077,7 +1077,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString & profileName, bool saveURLs, bool saveWindowSize )
{
- TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) +
+ TQString path = locateLocal( "data", TQString::tqfromLatin1( "konqueror/profiles/" ) +
fileName, KGlobal::instance() );
if ( TQFile::exists( path ) )
@@ -1096,7 +1096,7 @@ void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWi
{
//kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl;
if( m_pMainWindow->childFrame() != 0L ) {
- TQString prefix = TQString::fromLatin1( m_pMainWindow->childFrame()->frameType() )
+ TQString prefix = TQString::tqfromLatin1( m_pMainWindow->childFrame()->frameType() )
+ TQString::number(0);
cfg.writeEntry( "RootItem", prefix );
prefix.append( '_' );
@@ -1156,7 +1156,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename,
for ( it.toFirst(); it != 0L; ++it )
{
KonqView *view = it.current()->activeChildView();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) {
+ if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1)) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
showTab( view );
@@ -1175,7 +1175,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename,
else
{
KonqView *view = m_pMainWindow->currentView();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) {
+ if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1)) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( 0,
@@ -1413,7 +1413,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget )
TQRect geom = KGlobalSettings::desktopGeometry(widget);
- if ( widthStr.contains( '%' ) == 1 )
+ if ( widthStr.tqcontains( '%' ) == 1 )
{
widthStr.truncate( widthStr.length() - 1 );
int relativeWidth = widthStr.toInt( &ok );
@@ -1428,7 +1428,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget )
width = -1;
}
- if ( heightStr.contains( '%' ) == 1 )
+ if ( heightStr.tqcontains( '%' ) == 1 )
{
heightStr.truncate( heightStr.length() - 1 );
int relativeHeight = heightStr.toInt( &ok );
@@ -1465,8 +1465,8 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
serviceType = "text/html";
serviceName = "html";
} else {
- serviceType = cfg.readEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory");
- serviceName = cfg.readEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ) );
+ serviceType = cfg.readEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory");
+ serviceName = cfg.readEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ) );
}
//kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl;
@@ -1480,17 +1480,17 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
return; //ugh..
}
- bool passiveMode = cfg.readBoolEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), false );
+ bool passiveMode = cfg.readBoolEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), false );
//kdDebug(1202) << "KonqViewManager::loadItem: Creating View Stuff" << endl;
KonqView *childView = setupView( parent, viewFactory, service, partServiceOffers, appServiceOffers, serviceType, passiveMode, openAfterCurrentPage );
- if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), false ) );
- childView->setToggleView( cfg.readBoolEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), false ) );
- if( !cfg.readBoolEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) )
+ if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), false ) );
+ childView->setToggleView( cfg.readBoolEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), false ) );
+ if( !cfg.readBoolEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) )
childView->frame()->statusbar()->hide();
- if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false ))
+ if (cfg.readBoolEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), false ))
m_pDocContainer = childView->frame();
if (!m_pDocContainer)
@@ -1536,7 +1536,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
childView->frame()->show();
- TQString key = TQString::fromLatin1( "URL" ).prepend( prefix );
+ TQString key = TQString::tqfromLatin1( "URL" ).prepend( prefix );
if ( openURL )
{
KURL url;
@@ -1546,11 +1546,11 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
{
TQString u = cfg.readPathEntry( key );
if ( u.isEmpty() )
- u = TQString::fromLatin1("about:blank");
+ u = TQString::tqfromLatin1("about:blank");
url = u;
}
else if(key == "empty_URL")
- url = TQString::fromLatin1("about:blank");
+ url = TQString::tqfromLatin1("about:blank");
else
url = defaultURL;
@@ -1567,13 +1567,13 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
//else kdDebug(1202) << "KonqViewManager::loadItem: url is empty" << endl;
}
// Do this after opening the URL, so that it's actually possible to open it :)
- childView->setLockedLocation( cfg.readBoolEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), false ) );
+ childView->setLockedLocation( cfg.readBoolEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), false ) );
}
else if( name.startsWith("Container") ) {
//kdDebug(1202) << "KonqViewManager::loadItem Item is Container" << endl;
//load container config
- TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) );
+ TQString ostr = cfg.readEntry( TQString::tqfromLatin1( "Orientation" ).prepend( prefix ) );
//kdDebug(1202) << "Orientation: " << ostr << endl;
Qt::Orientation o;
if( ostr == "Vertical" )
@@ -1586,12 +1586,12 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
}
TQValueList<int> sizes =
- cfg.readIntListEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix ));
+ cfg.readIntListEntry( TQString::tqfromLatin1( "SplitterSizes" ).prepend( prefix ));
- int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), -1 );
+ int index = cfg.readNumEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend(prefix), -1 );
TQStrList childList;
- if( cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), childList ) < 2 )
+ if( cfg.readListEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), childList ) < 2 )
{
kdWarning() << "Profile Loading Error: Less than two children in " << name << endl;
// fallback to defaults
@@ -1608,7 +1608,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
parent->insertChildFrame( newContainer, tabindex );
- if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false ))
+ if (cfg.readBoolEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), false ))
m_pDocContainer = newContainer;
loadItem( cfg, newContainer, childList.at(0), defaultURL, openURL );
@@ -1634,9 +1634,9 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
parent->insertChildFrame( newContainer );
m_pDocContainer = newContainer;
- int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), 0 );
+ int index = cfg.readNumEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend(prefix), 0 );
- TQStringList childList = cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ) );
+ TQStringList childList = cfg.readListEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ) );
for ( TQStringList::Iterator it = childList.begin(); it != childList.end(); ++it )
{
loadItem( cfg, newContainer, *it, defaultURL, openURL );
diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg
index a412347d1..756b80e2d 100644
--- a/konqueror/konqueror.kcfg
+++ b/konqueror/konqueror.kcfg
@@ -223,7 +223,7 @@
<!-- checked -->
</entry>
<entry key="DefaultEncoding" type="String"> <!--KHTML-->
- <default code="true">QString::null</default>
+ <default code="true">TQString()</default>
<label></label>
<whatsthis></whatsthis>
<!-- checked -->
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index 7b06a4996..842f870ec 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -206,7 +206,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled )
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
-void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
{
TQColorGroup cg( _cg );
@@ -218,7 +218,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup &
cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() );
KListView *lv = static_cast< KListView* >( listView() );
- const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
+ const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap());
if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() )
{
int newWidth = width( lv->fontMetrics(), lv, _column );
@@ -242,7 +242,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup &
_width = newWidth;
}
- KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
+ KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment );
}
void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r )
diff --git a/konqueror/listview/konq_infolistviewitem.h b/konqueror/listview/konq_infolistviewitem.h
index e81928118..2ba7b8067 100644
--- a/konqueror/listview/konq_infolistviewitem.h
+++ b/konqueror/listview/konq_infolistviewitem.h
@@ -56,7 +56,7 @@ class KonqInfoListViewItem : public KonqBaseListViewItem
virtual ~KonqInfoListViewItem() { }
virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg,
- int column, int width, int alignment );
+ int column, int width, int tqalignment );
virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r );
virtual void updateContents();
virtual void setDisabled( bool disabled );
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index 783c6eef3..135e11a09 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -32,12 +32,12 @@
#include <tqstringlist.h>
KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent,
- TQWidget* parentWidget)
- : KonqBaseListViewWidget(parent, parentWidget)
+ TQWidget* tqparentWidget)
+ : KonqBaseListViewWidget(parent, tqparentWidget)
{
m_metaInfoJob = 0;
- m_mtSelector = new KSelectAction(i18n("View &As"), 0, this,
+ m_mtSelector = new KSelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSelectMimeType()),
parent->actionCollection(), "view_as" );
@@ -201,7 +201,7 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
}
if ( !m_itemsToSelect.isEmpty() ) {
- TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( tmp, true );
@@ -375,7 +375,7 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list)
if (m_favorite.mimetype)
{
- m_mtSelector->setCurrentItem(mtlist.findIndex(m_favorite.mimetype->comment()));
+ m_mtSelector->setCurrentItem(mtlist.tqfindIndex(m_favorite.mimetype->comment()));
kdDebug(1203) << "favorite mimetype is " << m_favorite.mimetype->name() << endl;
}
createFavoriteColumns();
diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h
index 5ae497ac2..46bda8b22 100644
--- a/konqueror/listview/konq_infolistviewwidget.h
+++ b/konqueror/listview/konq_infolistviewwidget.h
@@ -37,7 +37,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget
// friend class KonqTextViewItem;
Q_OBJECT
public:
- KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget );
+ KonqInfoListViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
~KonqInfoListViewWidget();
const TQStringList columnKeys() {return m_columnKeys;}
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index f256e8e3b..3307073de 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -63,12 +63,12 @@ KonqListViewFactory::~KonqListViewFactory()
s_defaultViewProps = 0;
}
-KParts::Part* KonqListViewFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args )
+KParts::Part* KonqListViewFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args )
{
if( args.count() < 1 )
kdWarning() << "KonqListView: Missing Parameter" << endl;
- KParts::Part *obj = new KonqListView( parentWidget, parent, name, args.first() );
+ KParts::Part *obj = new KonqListView( tqparentWidget, parent, name, args.first() );
return obj;
}
@@ -144,7 +144,7 @@ void ListViewBrowserExtension::updateActions()
void ListViewBrowserExtension::copySelection( bool move )
{
KonqDrag *urlData = new KonqDrag( m_listView->listViewWidget()->selectedUrls(false), m_listView->listViewWidget()->selectedUrls(true), move );
- TQApplication::clipboard()->setData( urlData );
+ TQApplication::tqclipboard()->setData( urlData );
}
void ListViewBrowserExtension::paste()
@@ -169,11 +169,11 @@ void ListViewBrowserExtension::rename()
const TQString txt = le->text();
TQString pattern;
KMimeType::diagnoseFileName( txt, pattern );
- if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1)
+ if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.tqfind('*',1)==-1)
le->setSelection(0, txt.length()-pattern.stripWhiteSpace().length()+1);
else
{
- int lastDot = txt.findRev('.');
+ int lastDot = txt.tqfindRev('.');
if (lastDot > 0)
le->setSelection(0, lastDot);
}
@@ -216,7 +216,7 @@ void ListViewBrowserExtension::editMimeType()
KonqOperations::editMimeType( items.first()->mimetype() );
}
-KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode )
+KonqListView::KonqListView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode )
: KonqDirPart( parent, name )
,m_headerTimer(0)
{
@@ -234,25 +234,25 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char
{
kdDebug(1202) << "Creating KonqTextViewWidget" << endl;
xmlFile = "konq_textview.rc";
- m_pListView=new KonqTextViewWidget(this, parentWidget);
+ m_pListView=new KonqTextViewWidget(this, tqparentWidget);
}
else if (mode=="MixedTree")
{
kdDebug(1202) << "Creating KonqTreeViewWidget" << endl;
xmlFile = "konq_treeview.rc";
- m_pListView=new KonqTreeViewWidget(this,parentWidget);
+ m_pListView=new KonqTreeViewWidget(this,tqparentWidget);
}
else if (mode=="InfoListView")
{
kdDebug(1202) << "Creating KonqInfoListViewWidget" << endl;
xmlFile = "konq_infolistview.rc";
- m_pListView=new KonqInfoListViewWidget(this,parentWidget);
+ m_pListView=new KonqInfoListViewWidget(this,tqparentWidget);
}
else
{
kdDebug(1202) << "Creating KonqDetailedListViewWidget" << endl;
xmlFile = "konq_detailedlistview.rc";
- m_pListView = new KonqBaseListViewWidget( this, parentWidget);
+ m_pListView = new KonqBaseListViewWidget( this, tqparentWidget);
}
setWidget( m_pListView );
setDirLister( m_pListView->m_dirLister );
diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h
index 8665160d3..0fc8f0340 100644
--- a/konqueror/listview/konq_listview.h
+++ b/konqueror/listview/konq_listview.h
@@ -44,7 +44,7 @@ public:
KonqListViewFactory();
virtual ~KonqListViewFactory();
- virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args );
+ virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args );
static KInstance *instance();
static KonqPropsView *defaultViewProps();
@@ -65,7 +65,7 @@ class KonqListView : public KonqDirPart
Q_OBJECT
Q_PROPERTY( bool supportsUndo READ supportsUndo )
public:
- KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode );
+ KonqListView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode );
virtual ~KonqListView();
virtual const KFileItem * currentItem();
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index 3c70f1fb0..a66dbb06c 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -144,7 +144,7 @@ void KonqListViewItem::updateContents()
const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra );
if ( tmpColumn->type == TQVariant::DateTime )
{
- TQDateTime dt = TQDateTime::fromString( entryStr, Qt::ISODate );
+ TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr, Qt::ISODate ));
setText(tmpColumn->displayInColumn,
KGlobal::locale()->formatDateTime(dt));
}
@@ -173,7 +173,7 @@ void KonqListViewItem::setActive( bool active )
if ( m_bActive == active )
return;
- //#### Optimize away repaint if possible, like the iconview does?
+ //#### Optimize away tqrepaint if possible, like the iconview does?
KonqBaseListViewItem::setActive( active );
int iconSize = m_pListViewWidget->iconSize();
iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
@@ -203,7 +203,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm )
int newWidth = pm.isNull() ? 0 : pm.width();
int newHeight = pm.isNull() ? 0 : pm.height();
- // If the height or width have changed then we're going to have to repaint
+ // If the height or width have changed then we're going to have to tqrepaint
// this whole thing. Fortunately since most of the calls are coming from
// setActive() this is the uncommon case.
@@ -211,12 +211,12 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm )
{
setup();
widthChanged( column );
- invalidateHeight();
+ tqinvalidateHeight();
return;
}
// If we're just replacing the icon with another one its size -- i.e. a
- // "highlighted" icon, don't bother repainting the whole widget.
+ // "highlighted" icon, don't bother tqrepainting the whole widget.
TQListView *lv = m_pListViewWidget;
@@ -225,7 +225,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm )
int y = lv->itemPos( this );
int w = newWidth;
int h = height();
- lv->repaintContents( x, y, w, h );
+ lv->tqrepaintContents( x, y, w, h );
}
const TQPixmap* KonqListViewItem::pixmap( int column ) const
@@ -275,9 +275,9 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
{
if ( cInfo->type & TQVariant::DateTime ) {
const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra );
- TQDateTime dt1 = TQDateTime::fromString( entryStr1, Qt::ISODate );
+ TQDateTime dt1 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr1, Qt::ISODate ));
const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra );
- TQDateTime dt2 = TQDateTime::fromString( entryStr2, Qt::ISODate );
+ TQDateTime dt2 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr2, Qt::ISODate ));
return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0;
}
}
@@ -294,7 +294,7 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
}
}
-void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
{
TQColorGroup cg( _cg );
@@ -306,7 +306,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() );
KListView *lv = static_cast< KListView* >( listView() );
- const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
+ const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap());
if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() )
{
int newWidth = width( lv->fontMetrics(), lv, _column );
@@ -330,7 +330,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
_width = newWidth;
}
- KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
+ KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment );
}
void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r )
@@ -421,7 +421,7 @@ KonqBaseListViewItem::~KonqBaseListViewItem()
TQRect KonqBaseListViewItem::rect() const
{
- TQRect r = m_pListViewWidget->itemRect(this);
+ TQRect r = m_pListViewWidget->tqitemRect(this);
return TQRect( m_pListViewWidget->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) );
}
diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h
index b54f1c2db..8e78b10f0 100644
--- a/konqueror/listview/konq_listviewitems.h
+++ b/konqueror/listview/konq_listviewitems.h
@@ -107,7 +107,7 @@ class KonqListViewItem : public KonqBaseListViewItem
virtual ~KonqListViewItem();
virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg,
- int column, int width, int alignment );
+ int column, int width, int tqalignment );
virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r );
virtual void updateContents();
virtual void setDisabled( bool disabled );
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 8f166af0a..d61518767 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -84,8 +84,8 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio
}
-KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget)
- : KListView(parentWidget)
+KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget)
+ : KListView(tqparentWidget)
,sortedByColumn(0)
,m_pBrowserView(parent)
,m_dirLister(new KDirLister( true /*m_showIcons==false*/))
@@ -107,7 +107,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
{
kdDebug(1202) << "+KonqBaseListViewWidget" << endl;
- m_dirLister->setMainWindow(topLevelWidget());
+ m_dirLister->setMainWindow(tqtopLevelWidget());
m_bTopLevelComplete = true;
@@ -169,8 +169,8 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) );
viewport()->setMouseTracking( true );
- viewport()->setFocusPolicy( TQWidget::WheelFocus );
- setFocusPolicy( TQWidget::WheelFocus );
+ viewport()->setFocusPolicy( TQ_WheelFocus );
+ setFocusPolicy( TQ_WheelFocus );
setAcceptDrops( true );
//looks better with the statusbar
@@ -228,7 +228,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
for ( int num = 1; extraFieldsIt != extraFields.end(); ++extraFieldsIt, ++num )
{
const TQString column = (*extraFieldsIt).name;
- if ( lstColumns.find(column) == lstColumns.end() )
+ if ( lstColumns.tqfind(column) == lstColumns.end() )
lstColumns << column;
const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting
TQVariant::Type t = TQVariant::Invalid;
@@ -325,7 +325,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
continue;
}
- TQStringList::Iterator listIt = listingList.find( confColumns[i].desktopFileName );
+ TQStringList::Iterator listIt = listingList.tqfind( confColumns[i].desktopFileName );
if ( listIt == listingList.end() ) // not found -> hide
{
//move all columns behind one to the front
@@ -410,7 +410,7 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e )
TQRect r( m_rubber->normalize() );
delete m_rubber;
m_rubber = 0;
- repaintContents( r, FALSE );
+ tqrepaintContents( r, FALSE );
}
delete m_selected;
@@ -424,14 +424,14 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e )
KListView::contentsMousePressEvent( e );
}
else {
- if ( e->button() == LeftButton )
+ if ( e->button() == Qt::LeftButton )
{
m_rubber = new TQRect( e->x(), e->y(), 0, 0 );
clearSelection();
emit selectionChanged();
m_fileTip->setItem( 0 );
}
- if ( e->button() != RightButton )
+ if ( e->button() != Qt::RightButton )
TQListView::contentsMousePressEvent( e );
}
// Store list of selected items at mouse-press time.
@@ -448,7 +448,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e )
TQRect r( m_rubber->normalize() );
delete m_rubber;
m_rubber = 0;
- repaintContents( r, FALSE );
+ tqrepaintContents( r, FALSE );
}
if ( m_scrollTimer )
@@ -489,7 +489,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
emit m_pBrowserView->setStatusBarText( item->item()->getStatusBarInfo() );
m_pBrowserView->emitMouseOver( item->item() );
- vp.setY( itemRect( item ).y() );
+ vp.setY( tqitemRect( item ).y() );
TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) );
m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) );
m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) );
@@ -551,9 +551,9 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p )
TQPoint pt( m_rubber->x(), m_rubber->y() );
pt = contentsToViewport( pt );
- style().drawPrimitive( TQStyle::PE_RubberBand, p,
+ tqstyle().tqdrawPrimitive( TQStyle::PE_RubberBand, p,
TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
- colorGroup(), TQStyle::Style_Default, colorGroup().base() );
+ tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup().base() );
}
@@ -591,9 +591,9 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
TQRect rect;
if ( allColumnsShowFocus() )
- rect = itemRect( cur );
+ rect = tqitemRect( cur );
else {
- rect = itemRect( cur );
+ rect = tqitemRect( cur );
rect.setWidth( executeArea( cur ) );
}
@@ -623,7 +623,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
setSelected( cur, true );
changed = TRUE;
- rr = rr.unite( itemRect( cur ) );
+ rr = rr.unite( tqitemRect( cur ) );
}
}
else
@@ -631,10 +631,10 @@ void KonqBaseListViewWidget::slotAutoScroll()
if ( cur->isSelected() )
{
changed = TRUE;
- rr = rr.unite( itemRect( cur ) );
+ rr = rr.unite( tqitemRect( cur ) );
}
- if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
+ if ( !m_selected || !m_selected->tqcontains( (KonqBaseListViewItem*)cur ) )
{
setSelected( cur, false );
}
@@ -659,7 +659,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
setSelected( cur, true );
changed = TRUE;
- rr = rr.unite( itemRect( cur ) );
+ rr = rr.unite( tqitemRect( cur ) );
}
}
else
@@ -667,10 +667,10 @@ void KonqBaseListViewWidget::slotAutoScroll()
if ( cur->isSelected() )
{
changed = TRUE;
- rr = rr.unite( itemRect( cur ) );
+ rr = rr.unite( tqitemRect( cur ) );
}
- if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
+ if ( !m_selected || !m_selected->tqcontains( (KonqBaseListViewItem*)cur ) )
{
setSelected( cur, false );
}
@@ -718,7 +718,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
if ( !TQRect( scroll_margin, scroll_margin,
viewport()->width() - 2*scroll_margin,
- viewport()->height() - 2*scroll_margin ).contains( pos ) )
+ viewport()->height() - 2*scroll_margin ).tqcontains( pos ) )
{
if ( !m_scrollTimer )
{
@@ -762,7 +762,7 @@ void KonqBaseListViewWidget::viewportDragMoveEvent( TQDragMoveEvent *_ev )
// Unselect previous drag-over-item
if ( m_dragOverItem && m_dragOverItem != item )
- if ( !m_selected || !m_selected->contains( m_dragOverItem ) )
+ if ( !m_selected || !m_selected->tqcontains( m_dragOverItem ) )
setSelected( m_dragOverItem, false );
if ( !item )
@@ -900,7 +900,7 @@ void KonqBaseListViewWidget::slotSelectionChanged()
void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button,
TQListViewItem *_item, const TQPoint& pos, int )
{
- if ( _button == MidButton )
+ if ( _button == Qt::MidButton )
{
if ( _item && isExecuteArea( viewport()->mapFromGlobal(pos) ) )
m_pBrowserView->mmbClicked( static_cast<KonqBaseListViewItem *>(_item)->item() );
@@ -985,17 +985,17 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
if (_item->pixmap(0) != 0)
{
// Rect of the QListViewItem's pixmap area.
- TQRect rect = _item->listView()->itemRect(_item);
+ TQRect rect = _item->listView()->tqitemRect(_item);
// calculate nesting depth
int nestingDepth = 0;
- for (TQListViewItem *currentItem = _item->parent();
+ for (TQListViewItem *currentItem = _item->tqparent();
currentItem != 0;
- currentItem = currentItem->parent())
+ currentItem = currentItem->tqparent())
nestingDepth++;
// no parent no indent
- if (_item->parent() == 0)
+ if (_item->tqparent() == 0)
nestingDepth = 0;
// Root decoration means additional indent
@@ -1111,7 +1111,7 @@ bool KonqBaseListViewWidget::openURL( const KURL &url )
args.yOffset = contentsY();
m_pBrowserView->extension()->setURLArgs( args );
- if ( currentItem() && itemRect( currentItem() ).isValid() )
+ if ( currentItem() && tqitemRect( currentItem() ).isValid() )
m_itemToGoTo = currentItem()->text(0);
m_pBrowserView->m_filesToSelect.clear();
@@ -1255,7 +1255,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries )
m_itemFound = true;
}
if ( !m_itemsToSelect.isEmpty() ) {
- TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( tmp, true );
@@ -1371,13 +1371,13 @@ KonqBaseListViewWidget::iterator& KonqBaseListViewWidget::iterator::operator++()
m_p = i;
return *this;
}
- m_p = (KonqBaseListViewItem *)m_p->parent();
+ m_p = (KonqBaseListViewItem *)m_p->tqparent();
while ( m_p )
{
if ( m_p->nextSibling() )
break;
- m_p = (KonqBaseListViewItem *)m_p->parent();
+ m_p = (KonqBaseListViewItem *)m_p->tqparent();
}
if ( m_p )
@@ -1402,13 +1402,13 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in
m_p = i;
return it;
}
- m_p = (KonqBaseListViewItem *)m_p->parent();
+ m_p = (KonqBaseListViewItem *)m_p->tqparent();
while ( m_p )
{
if ( m_p->nextSibling() )
break;
- m_p = (KonqBaseListViewItem *)m_p->parent();
+ m_p = (KonqBaseListViewItem *)m_p->tqparent();
}
if ( m_p )
@@ -1418,7 +1418,7 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in
void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r )
{
- const TQPixmap *pm = viewport()->paletteBackgroundPixmap();
+ const TQPixmap *pm = TQT_TQPIXMAP_CONST(viewport()->paletteBackgroundPixmap());
if (!pm || pm->isNull())
p->fillRect(r, viewport()->backgroundColor());
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index d6123c11f..7d57c202f 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -81,7 +81,7 @@ class KonqBaseListViewWidget : public KListView
Q_OBJECT
public:
- KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget );
+ KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
virtual ~KonqBaseListViewWidget();
unsigned int NumberOfAtoms;
@@ -176,7 +176,7 @@ protected slots:
virtual void slotRedirection( const KURL & );
void slotPopupMenu( TQListViewItem *, const TQPoint&, int );
- // forces a repaint on column size changes / branch expansion
+ // forces a tqrepaint on column size changes / branch expansion
// when there is a background pixmap
void slotUpdateBackground();
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc
index 8e03e171e..0d40ecfce 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cc
@@ -200,7 +200,7 @@ void KonqTextViewItem::updateContents()
};
}
-void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
{
TQColorGroup cg( _cg );
cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]);
@@ -208,7 +208,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
// cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]);
// cg.setColor(TQColorGroup::Highlight, Qt::darkGray);
- KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
+ KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment );
}
/*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r )
diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h
index f091781e2..02a534688 100644
--- a/konqueror/listview/konq_textviewitem.h
+++ b/konqueror/listview/konq_textviewitem.h
@@ -57,7 +57,7 @@ class KonqTextViewItem : public KonqBaseListViewItem
// virtual TQString key( int _column, bool asc) const;
/** Call this before destroying the text view (decreases reference count
* on the view)*/
- virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment );
// virtual void paintFocus( TQPainter *_painter, const TQColorGroup & _cg, const TQRect & r );
virtual void updateContents();
diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc
index 32de25351..f3e9140d3 100644
--- a/konqueror/listview/konq_textviewwidget.cc
+++ b/konqueror/listview/konq_textviewwidget.cc
@@ -29,8 +29,8 @@
#include <assert.h>
-KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget )
-:KonqBaseListViewWidget(parent,parentWidget)
+KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget )
+:KonqBaseListViewWidget(parent,tqparentWidget)
{
kdDebug(1202) << "+KonqTextViewWidget" << endl;
m_filenameColumn=1;
@@ -88,7 +88,7 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries )
m_itemFound = true;
}
if ( !m_itemsToSelect.isEmpty() ) {
- TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( tmp, true );
diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h
index 06a5cbbb5..5596e4d23 100644
--- a/konqueror/listview/konq_textviewwidget.h
+++ b/konqueror/listview/konq_textviewwidget.h
@@ -34,7 +34,7 @@ class KonqTextViewWidget : public KonqBaseListViewWidget
friend class KonqTextViewItem;
Q_OBJECT
public:
- KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget );
+ KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
~KonqTextViewWidget();
virtual bool isExecuteArea( const TQPoint& point );
diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc
index 4d04f2fa4..5fefc8133 100644
--- a/konqueror/listview/konq_treeviewwidget.cc
+++ b/konqueror/listview/konq_treeviewwidget.cc
@@ -27,8 +27,8 @@
template class TQDict<KonqListViewDir>;
-KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget)
- : KonqBaseListViewWidget( parent, parentWidget )
+KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget)
+ : KonqBaseListViewWidget( parent, tqparentWidget )
{
kdDebug(1202) << "+KonqTreeViewWidget" << endl;
@@ -246,7 +246,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries )
}
if ( !m_itemsToSelect.isEmpty() ) {
- TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( fileItem ? fileItem : dirItem, true );
diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h
index 3f08cc3d5..8ced17e6b 100644
--- a/konqueror/listview/konq_treeviewwidget.h
+++ b/konqueror/listview/konq_treeviewwidget.h
@@ -34,7 +34,7 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget
Q_OBJECT
public:
- KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget );
+ KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
virtual ~KonqTreeViewWidget();
virtual bool openURL( const KURL &url );
diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc
index 23c1704d9..020d7dc6b 100644
--- a/konqueror/preloader/preloader.cc
+++ b/konqueror/preloader/preloader.cc
@@ -109,8 +109,8 @@ void KonqyPreloader::updateCount()
{
if( !check_always_preloaded_timer.isActive())
{
- if( kapp->kdeinitExec( TQString::fromLatin1( "konqueror" ),
- TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
+ if( kapp->kdeinitExec( TQString::tqfromLatin1( "konqueror" ),
+ TQStringList() << TQString::tqfromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
{
kdDebug( 1202 ) << "Preloading Konqueror instance" << endl;
check_always_preloaded_timer.start( 5000, true );
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 7d84071fc..f8ca47992 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -41,7 +41,7 @@
#include "kremoteencodingplugin.h"
-#define DATA_KEY TQString::fromLatin1("Charset")
+#define DATA_KEY TQString::tqfromLatin1("Charset")
KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent,
const char *name,
@@ -142,7 +142,7 @@ KRemoteEncodingPlugin::updateMenu()
int id = 1;
TQStringList::Iterator it;
for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it, ++id)
- if ((*it).find(charset) != -1)
+ if ((*it).tqfind(charset) != -1)
break;
kdDebug() << k_funcinfo << "URL=" << m_currentURL << " charset=" << charset << endl;
diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp
index eefa57337..e41d1c99a 100644
--- a/konqueror/shellcmdplugin/kshellcmddialog.cpp
+++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp
@@ -43,10 +43,10 @@ KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString&
closeButton= new KPushButton(KStdGuiItem::close(), buttonsBox);
closeButton->setDefault(true);
- label->resize(label->sizeHint());
- m_shell->resize(m_shell->sizeHint());
- closeButton->setFixedSize(closeButton->sizeHint());
- cancelButton->setFixedSize(cancelButton->sizeHint());
+ label->resize(label->tqsizeHint());
+ m_shell->resize(m_shell->tqsizeHint());
+ closeButton->setFixedSize(closeButton->tqsizeHint());
+ cancelButton->setFixedSize(cancelButton->tqsizeHint());
box->addWidget(label,0);
box->addWidget(m_shell,1);
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
index 167f0f812..121dac7ad 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
@@ -84,11 +84,11 @@ int KShellCommandExecutor::exec()
return 0;
}
- m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this);
- m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this);
+ m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, TQT_TQOBJECT(this));
+ m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, TQT_TQOBJECT(this));
m_writeNotifier->setEnabled(false);
- connect (m_readNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(readDataFromShell()));
- connect (m_writeNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(writeDataToShell()));
+ connect (m_readNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(readDataFromShell()));
+ connect (m_writeNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(writeDataToShell()));
return 1;
}
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.h b/konqueror/shellcmdplugin/kshellcmdexecutor.h
index 98b733603..616cdbc13 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.h
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.h
@@ -26,7 +26,7 @@
class PtyProcess;
class TQSocketNotifier;
-class KShellCommandExecutor:public QTextView
+class KShellCommandExecutor:public TQTextView
{
Q_OBJECT
public:
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index bdc99a4ca..0e3f3512a 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -22,7 +22,7 @@
#include <tqapplication.h>
#include <kaccelmanager.h>
-KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
+KonqSidebar::KonqSidebar( TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name, bool universalMode )
: KParts::ReadOnlyPart(parent, name),KonqSidebarIface()
{
@@ -30,15 +30,15 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
setInstance( KonqSidebarFactory::instance() );
m_extension = 0;
// this should be your custom internal widget
- m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() );
+ m_widget = new Sidebar_Widget( tqparentWidget, this, widgetName ,universalMode, tqparentWidget->tqtopLevelWidget()->property("currentProfile").toString() );
m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
connect(m_widget,TQT_SIGNAL(started(KIO::Job *)),
this, TQT_SIGNAL(started(KIO::Job*)));
connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&)));
- KAcceleratorManager::setNoAccel(m_widget);
- setWidget(m_widget);
+ KAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget));
+ setWidget(TQT_TQWIDGET(m_widget));
}
KInstance *KonqSidebar::getInstance()
@@ -97,12 +97,12 @@ KonqSidebarFactory::~KonqSidebarFactory()
s_about = 0L;
}
-KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
+KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char * /*classname*/, const TQStringList &args )
{
// Create an instance of our Part
- KonqSidebar* obj = new KonqSidebar( parentWidget, widgetName, parent, name, args.contains("universal") );
+ KonqSidebar* obj = new KonqSidebar( tqparentWidget, widgetName, parent, name, args.tqcontains("universal") );
// See if we are to be read-write or not
// if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h
index ec63e6d00..2724b2d39 100644
--- a/konqueror/sidebar/konqsidebar.h
+++ b/konqueror/sidebar/konqsidebar.h
@@ -77,7 +77,7 @@ public:
/**
* Default constructor
*/
- KonqSidebar(TQWidget *parentWidget, const char *widgetName,
+ KonqSidebar(TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name,bool universalMode);
/**
@@ -113,7 +113,7 @@ class KonqSidebarFactory : public KParts::Factory
public:
KonqSidebarFactory();
virtual ~KonqSidebarFactory();
- 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 );
static KInstance* instance();
diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp
index 75e762d35..1839425dc 100644
--- a/konqueror/sidebar/konqsidebarplugin.cpp
+++ b/konqueror/sidebar/konqsidebarplugin.cpp
@@ -52,7 +52,7 @@ void KonqSidebarPlugin::handlePreviewOnMouseOver(const KFileItem& /*items*/) {}
bool KonqSidebarPlugin::universalMode() {
if (!parent()) return false;
- KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(parent()->qt_cast("KonqSidebarIface"));
+ KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(tqparent()->tqqt_cast("KonqSidebarIface"));
if (!ksi) return false;
kdDebug()<<"calling KonqSidebarIface->universalMode()"<<endl;
return ksi->universalMode();
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index d3ecf7ce4..8f3077b37 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -30,7 +30,7 @@
class KonqSidebarPluginPrivate;
-class KDE_EXPORT KonqSidebarPlugin : public QObject
+class KDE_EXPORT KonqSidebarPlugin : public TQObject
{
Q_OBJECT
public:
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index b4940e8e5..50163c46a 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -25,6 +25,7 @@
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <tqstringlist.h>
+#include <tqucomextra_p.h>
#include <klocale.h>
#include <ksimpleconfig.h>
@@ -168,7 +169,7 @@ static TQString findFileName(const TQString* tmpl,bool universal, const TQString
void addBackEnd::activatedAddMenu(int id)
{
- kdDebug() << "activatedAddMenu: " << TQString("%1").arg(id) << endl;
+ kdDebug() << "activatedAddMenu: " << TQString("%1").tqarg(id) << endl;
if (((uint)id) == libNames.size())
doRollBack();
if(((uint)id) >= libNames.size())
@@ -251,7 +252,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
m_buttons.setAutoDelete(true);
m_hasStoredUrl = false;
m_latestViewed = -1;
- setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
TQSplitter *splitterWidget = splitter();
if (splitterWidget) {
@@ -261,7 +262,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
}
m_area = new KDockArea(this);
- m_area->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_area->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_mainDockWidget = m_area->createDockWidget("free", 0);
m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget));
m_area->setMainDockWidget(m_mainDockWidget);
@@ -462,8 +463,8 @@ void Sidebar_Widget::initialCopy()
{
//kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
if ( *eIt != "." && *eIt != ".." &&
- !entries.contains( *eIt ) &&
- !dirEntries.contains( *eIt ) )
+ !entries.tqcontains( *eIt ) &&
+ !dirEntries.tqcontains( *eIt ) )
{ // we don't have that one yet -> copy it.
TQString cp("cp -R -- ");
cp += KProcess::quote(dirtree_dir + *eIt);
@@ -674,11 +675,11 @@ void Sidebar_Widget::stdAction(const char *handlestd)
kdDebug() << "Try calling >active< module's (" << mod->module->className() << ") slot " << handlestd << endl;
- int id = mod->module->metaObject()->findSlot( handlestd );
+ int id = mod->module->tqmetaObject()->tqfindSlot( handlestd );
if ( id == -1 )
return;
kdDebug() << "Action slot was found, it will be called now" << endl;
- QUObject o[ 1 ];
+ TQUObject o[ 1 ];
mod->module->qt_invoke( id, o );
return;
}
@@ -742,7 +743,7 @@ void Sidebar_Widget::createButtons()
for (uint i = 0; i < m_buttons.count(); i++)
{
ButtonInfo *button = m_buttons.at(i);
- if (m_openViews.contains(button->file))
+ if (m_openViews.tqcontains(button->file))
{
m_buttonBar->setTab(i,true);
m_noUpdate = true;
@@ -814,7 +815,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
{
m_buttonBar->appendTab(SmallIcon(icon), lastbtn, name);
ButtonInfo *bi = new ButtonInfo(desktoppath, ((KonqSidebar*)m_partParent),0, url, lib, name,
- icon, this);
+ icon, TQT_TQOBJECT(this));
/*int id=*/m_buttons.insert(lastbtn, bi);
KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn);
tab->installEventFilter(this);
@@ -833,7 +834,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
{
- if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton)
+ if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton)
{
KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj);
if (bt)
@@ -881,7 +882,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev)
{
if (ev->type()==TQEvent::MouseButtonPress &&
- ((TQMouseEvent *)ev)->button()==TQMouseEvent::RightButton &&
+ ((TQMouseEvent *)ev)->button()==Qt::RightButton &&
!m_disableConfig)
{ m_menu->exec(TQCursor::pos()); }
}
@@ -1042,28 +1043,28 @@ void Sidebar_Widget::showHidePage(int page)
void Sidebar_Widget::collapseExpandSidebar()
{
- if (!parentWidget())
+ if (!tqparentWidget())
return; // Can happen during destruction
if (m_visibleViews.count()==0)
{
m_somethingVisible = false;
- parentWidget()->setMaximumWidth(minimumSizeHint().width());
+ tqparentWidget()->setMaximumWidth(tqminimumSizeHint().width());
updateGeometry();
emit panelHasBeenExpanded(false);
} else {
m_somethingVisible = true;
- parentWidget()->setMaximumWidth(32767);
+ tqparentWidget()->setMaximumWidth(32767);
updateGeometry();
emit panelHasBeenExpanded(true);
}
}
-TQSize Sidebar_Widget::sizeHint() const
+TQSize Sidebar_Widget::tqsizeHint() const
{
if (m_somethingVisible)
return TQSize(m_savedWidth,200);
- return minimumSizeHint();
+ return tqminimumSizeHint();
}
void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid)
@@ -1122,7 +1123,7 @@ void Sidebar_Widget::createNewWindow( const KURL &url, const KParts::URLArgs &ar
void Sidebar_Widget::enableAction( const char * name, bool enabled )
{
- if (sender()->parent()->isA("ButtonInfo"))
+ if (TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo"))
{
ButtonInfo *btninfo = static_cast<ButtonInfo*>(sender()->parent());
if (btninfo)
@@ -1147,7 +1148,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled )
bool Sidebar_Widget::doEnableActions()
{
- if (!(sender()->parent()->isA("ButtonInfo")))
+ if (!(TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo")))
{
kdDebug()<<"Couldn't set active module, aborting"<<endl;
return false;
@@ -1194,50 +1195,50 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
void Sidebar_Widget::connectModule(TQObject *mod)
{
- if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("started(KIO::Job*)") != -1) {
connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*)));
}
- if (mod->metaObject()->findSignal("completed()") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("completed()") != -1) {
connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
}
- if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &,
const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const
TQPoint &, const KURL&, const TQString &, mode_t)));
}
- if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("popupMenu(KXMLGUIClient*,const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
const KURL &,const TQString &, mode_t)),this,
TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
const KURL &,const TQString &, mode_t)));
}
- if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) {
connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
}
- if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) {
connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
}
- if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) {
connect(mod,
TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
this,
TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
}
- if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("enableAction(const char*,bool)") != -1) {
connect(mod,TQT_SIGNAL(enableAction( const char *, bool)),
this,TQT_SLOT(enableAction(const char *, bool)));
}
- if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) {
+ if (mod->tqmetaObject()->tqfindSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) {
connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
}
@@ -1298,10 +1299,10 @@ void Sidebar_Widget::resizeEvent(TQResizeEvent* ev)
TQSplitter *Sidebar_Widget::splitter() const
{
if (m_universalMode) return 0;
- TQObject *p = parent();
+ TQObject *p = tqparent();
if (!p) return 0;
- p = p->parent();
- return static_cast<TQSplitter*>(p);
+ p = p->tqparent();
+ return static_cast<TQSplitter*>(TQT_TQWIDGET(p));
}
void Sidebar_Widget::userMovedSplitter()
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index c99ae3883..dd7182a35 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -70,7 +70,7 @@ public:
};
-class addBackEnd: public QObject
+class addBackEnd: public TQObject
{
Q_OBJECT
public:
@@ -93,7 +93,7 @@ private:
TQWidget *m_parent;
};
-class KDE_EXPORT Sidebar_Widget: public QWidget
+class KDE_EXPORT Sidebar_Widget: public TQWidget
{
Q_OBJECT
public:
@@ -107,7 +107,7 @@ public:
void stdAction(const char *handlestd);
//virtual KParts::ReadOnlyPart *getPart();
KParts::BrowserExtension *getExtension();
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
public slots:
void addWebSideBar(const KURL& url, const TQString& name);
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index d00605c82..e79ed82df 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -161,10 +161,10 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ
KBookmarkGroup parentGroup;
// try to get the parent group (assume that the TQListViewItem has been reparented by KListView)...
// if anything goes wrong, use the root.
- if (item->parent()) {
+ if (item->tqparent()) {
bool error = false;
- KonqSidebarBookmarkItem *parent = dynamic_cast<KonqSidebarBookmarkItem*>( (item->parent()) );
+ KonqSidebarBookmarkItem *parent = dynamic_cast<KonqSidebarBookmarkItem*>( (item->tqparent()) );
if (!parent) {
error = true;
} else {
@@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab()
else
return;
- DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), tree()->tqtopLevelWidget()->name());
if (bookmark.isGroup()) {
KBookmarkGroup group = bookmark.toGroup();
@@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation()
if ( !bookmark.isGroup() )
{
- kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
QClipboard::Selection );
- kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
QClipboard::Clipboard );
}
}
@@ -484,7 +484,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
fillGroup( item, grp );
TQString address(grp.address());
- if (m_folderOpenState.contains(address))
+ if (m_folderOpenState.tqcontains(address))
item->setOpen(m_folderOpenState[address]);
else
item->setOpen(false);
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 811867b14..16c1bfb78 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -108,7 +108,7 @@ bool KonqSidebarDirTreeItem::hasStandardIcon()
return m_fileItem->iconName() == "folder";
}
-void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
{
if (m_fileItem->isLink())
{
@@ -116,7 +116,7 @@ void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup
f.setItalic( TRUE );
_painter->setFont( f );
}
- TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment );
+ TQListViewItem::paintCell( _painter, _cg, _column, _width, _tqalignment );
}
KURL KonqSidebarDirTreeItem::externalURL() const
@@ -134,7 +134,7 @@ TQString KonqSidebarDirTreeItem::externalMimeType() const
bool KonqSidebarDirTreeItem::acceptsDrops( const TQStrList & formats )
{
- if ( formats.contains("text/uri-list") )
+ if ( formats.tqcontains("text/uri-list") )
return m_fileItem->acceptsDrops();
return false;
}
@@ -162,8 +162,8 @@ void KonqSidebarDirTreeItem::itemSelected()
if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() )
bInTrash = true;
- TQMimeSource *data = TQApplication::clipboard()->data();
- bool paste = ( data->encodedData( data->format() ).size() != 0 );
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
+ bool paste = ( data->tqencodedData( data->format() ).size() != 0 );
tree()->enableActions( true, true, paste, true && !bInTrash, true, true );
}
@@ -197,7 +197,7 @@ void KonqSidebarDirTreeItem::paste()
{
// move or not move ?
bool move = false;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
index 050f19424..3a599c7e9 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
@@ -36,7 +36,7 @@ public:
virtual void setOpen( bool open );
- virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment );
virtual bool acceptsDrops( const TQStrList & formats );
virtual void drop( TQDropEvent * ev );
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index ac26b1285..401c4985a 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -357,7 +357,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
if (openItem)
{
// We have this directory listed already, just copy the entries as we
- // can't use the dirlister, it would invalidate the old entries
+ // can't use the dirlister, it would tqinvalidate the old entries
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
KonqSidebarTreeItem * parentItem = item;
KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild());
@@ -549,7 +549,7 @@ void KonqSidebarDirTreeModule::slotRedirection( const KURL & oldUrl, const KURL
do
{
- if (item->alias.contains(newUrlStr)) continue;
+ if (item->alias.tqcontains(newUrlStr)) continue;
kdDebug()<<"Redirectiong element"<<endl;
// We need to update the URL in m_dictSubDirs
m_dictSubDirs.insert( newUrlStr, item );
@@ -574,7 +574,7 @@ void KonqSidebarDirTreeModule::slotListingStopped( const KURL & url )
if ( item->childCount() == 0 )
{
item->setExpandable( false );
- item->repaint();
+ item->tqrepaint();
}
m_pTree->stopAnimation( item );
diff --git a/konqueror/sidebar/trees/history_module/history_dlg.ui b/konqueror/sidebar/trees/history_module/history_dlg.ui
index 32fd31296..a90c1c49e 100644
--- a/konqueror/sidebar/trees/history_module/history_dlg.ui
+++ b/konqueror/sidebar/trees/history_module/history_dlg.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>KonqSidebarHistoryDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KonqHistoryDlg</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>gbLimits</cstring>
</property>
@@ -40,14 +40,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>240</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QCheckBox" row="1" column="0">
+ <widget class="TQCheckBox" row="1" column="0">
<property name="name">
<cstring>cbExpire</cstring>
</property>
@@ -60,7 +60,7 @@
<cstring>spinExpire</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>lEntries</cstring>
</property>
@@ -78,7 +78,7 @@
</widget>
</grid>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>gbFonts</cstring>
</property>
@@ -99,12 +99,12 @@
<cstring>spinOlder</cstring>
</property>
</widget>
- <widget class="QComboBox" row="1" column="2">
+ <widget class="TQComboBox" row="1" column="2">
<property name="name">
<cstring>comboOlder</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>lbNewer</cstring>
</property>
@@ -112,12 +112,12 @@
<string>URLs newer than</string>
</property>
</widget>
- <widget class="QComboBox" row="0" column="2">
+ <widget class="TQComboBox" row="0" column="2">
<property name="name">
<cstring>comboNewer</cstring>
</property>
</widget>
- <widget class="QPushButton" row="1" column="3">
+ <widget class="TQPushButton" row="1" column="3">
<property name="name">
<cstring>btnFontOlder</cstring>
</property>
@@ -125,7 +125,7 @@
<string>Choose Font...</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>lbOlder</cstring>
</property>
@@ -133,7 +133,7 @@
<string>URLs older than</string>
</property>
</widget>
- <widget class="QPushButton" row="0" column="3">
+ <widget class="TQPushButton" row="0" column="3">
<property name="name">
<cstring>btnFontNewer</cstring>
</property>
@@ -143,7 +143,7 @@
</widget>
</grid>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>gbDetails</cstring>
</property>
@@ -154,7 +154,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>cbDetailedTips</cstring>
</property>
@@ -167,7 +167,7 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout4</cstring>
</property>
@@ -175,7 +175,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>btnClearHistory</cstring>
</property>
@@ -193,7 +193,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>418</width>
<height>0</height>
@@ -212,7 +212,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>30</height>
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 981be03bb..57647c04c 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -29,7 +29,7 @@
#include <kiconloader.h>
#define MYMODULE static_cast<KonqSidebarHistoryModule*>(module())
-#define MYGROUP static_cast<KonqSidebarHistoryGroupItem*>(parent())
+#define MYGROUP static_cast<KonqSidebarHistoryGroupItem*>(tqparent())
KonqSidebarHistorySettings * KonqSidebarHistoryItem::s_settings = 0L;
@@ -126,30 +126,30 @@ TQString KonqSidebarHistoryItem::toolTipText() const
}
void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
- int column, int width, int alignment )
+ int column, int width, int tqalignment )
{
TQDateTime dt;
- TQDateTime current = TQDateTime::currentDateTime();
+ TQDateTime current = TQDateTime::tqcurrentDateTime();
if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS )
- dt = current.addDays( - s_settings->m_valueYoungerThan );
+ dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan ));
else
- dt = current.addSecs( - (s_settings->m_valueYoungerThan * 60) );
+ dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueYoungerThan * 60) ));
if ( m_entry->lastVisited > dt )
p->setFont( s_settings->m_fontYoungerThan );
else {
if ( s_settings->m_metricOlderThan == KonqSidebarHistorySettings::DAYS )
- dt = current.addDays( - s_settings->m_valueOlderThan );
+ dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueOlderThan ));
else
- dt = current.addSecs( - (s_settings->m_valueOlderThan * 60) );
+ dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueOlderThan * 60) ));
if ( m_entry->lastVisited < dt )
p->setFont( s_settings->m_fontOlderThan );
}
- KonqSidebarTreeItem::paintCell( p, cg, column, width, alignment );
+ KonqSidebarTreeItem::paintCell( p, cg, column, width, tqalignment );
}
///////////////////////////////////////////////////////////////////
diff --git a/konqueror/sidebar/trees/history_module/history_item.h b/konqueror/sidebar/trees/history_module/history_item.h
index 1c6c7c4c4..0ddc7ae4e 100644
--- a/konqueror/sidebar/trees/history_module/history_item.h
+++ b/konqueror/sidebar/trees/history_module/history_item.h
@@ -60,7 +60,7 @@ public:
static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; }
virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column,
- int width, int alignment );
+ int width, int tqalignment );
private:
const KonqHistoryEntry *m_entry;
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index a3806be94..2c8cd5728 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -54,7 +54,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() ));
m_dict.setAutoDelete( true );
- m_currentTime = TQDateTime::currentDateTime();
+ m_currentTime = TQDateTime::tqcurrentDateTime();
KConfig *kc = KGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
@@ -132,7 +132,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
KonqHistoryEntry *entry;
KonqHistoryList entries( KonqHistoryManager::kself()->entries() );
KonqHistoryIterator it( entries );
- m_currentTime = TQDateTime::currentDateTime();
+ m_currentTime = TQDateTime::tqcurrentDateTime();
// the group item and the item of the serverroot '/' get a fav-icon
// if available. All others get the protocol icon.
@@ -149,7 +149,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
TQStringList::Iterator it2 = openGroups.begin();
KonqSidebarHistoryGroupItem *group;
while ( it2 != openGroups.end() ) {
- group = m_dict.find( *it2 );
+ group = m_dict.tqfind( *it2 );
if ( group )
group->setOpen( true );
@@ -171,7 +171,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
if ( !m_initialized )
return;
- m_currentTime = TQDateTime::currentDateTime();
+ m_currentTime = TQDateTime::tqcurrentDateTime();
KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url );
KonqSidebarHistoryItem *item = group->findChild( entry );
if ( !item )
@@ -185,7 +185,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
t->lockScrolling( true );
group->sort();
m_topLevelItem->sort();
- qApp->processOneEvent();
+ tqApp->processOneEvent();
t->lockScrolling( false );
}
@@ -195,7 +195,7 @@ void KonqSidebarHistoryModule::slotEntryRemoved( const KonqHistoryEntry *entry )
return;
TQString groupKey = groupForURL( entry->url );
- KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey );
+ KonqSidebarHistoryGroupItem *group = m_dict.tqfind( groupKey );
if ( !group )
return;
@@ -324,7 +324,7 @@ void KonqSidebarHistoryModule::groupOpened( KonqSidebarHistoryGroupItem *item, b
KonqSidebarHistoryGroupItem * KonqSidebarHistoryModule::getGroupItem( const KURL& url )
{
const TQString& groupKey = groupForURL( url );
- KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey );
+ KonqSidebarHistoryGroupItem *group = m_dict.tqfind( groupKey );
if ( !group ) {
group = new KonqSidebarHistoryGroupItem( url, m_topLevelItem );
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 6871415a0..20ca214d4 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -56,8 +56,8 @@ void KonqSidebarHistorySettings::readSettings(bool global)
m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 );
m_valueOlderThan = config->readNumEntry("Value olderThan", 2 );
- TQString minutes = TQString::fromLatin1("minutes");
- TQString days = TQString::fromLatin1("days");
+ TQString minutes = TQString::tqfromLatin1("minutes");
+ TQString days = TQString::tqfromLatin1("days");
TQString metric = config->readEntry("Metric youngerThan", days );
m_metricYoungerThan = (metric == days) ? DAYS : MINUTES;
metric = config->readEntry("Metric olderThan", days );
@@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings()
config->writeEntry("Value youngerThan", m_valueYoungerThan );
config->writeEntry("Value olderThan", m_valueOlderThan );
- TQString minutes = TQString::fromLatin1("minutes");
- TQString days = TQString::fromLatin1("days");
+ TQString minutes = TQString::tqfromLatin1("minutes");
+ TQString days = TQString::tqfromLatin1("days");
config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ?
days : minutes );
config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ?
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index ccedf65d9..532e3a164 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -144,8 +144,8 @@ void HistorySidebarConfig::load()
void HistorySidebarConfig::save()
{
- Q_UINT32 age = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0;
- Q_UINT32 count = dialog->spinEntries->value();
+ TQ_UINT32 age = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0;
+ TQ_UINT32 count = dialog->spinEntries->value();
KConfig config("konquerorrc");
config.setGroup("HistorySettings");
@@ -156,13 +156,13 @@ void HistorySidebarConfig::save()
TQDataStream streamAge( dataAge, IO_WriteOnly );
streamAge << age << "foo";
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyMaxAge(Q_UINT32, TQCString)", dataAge );
+ "notifyMaxAge(TQ_UINT32, TQCString)", dataAge );
TQByteArray dataCount;
TQDataStream streamCount( dataCount, IO_WriteOnly );
streamCount << count << "foo";
kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
- "notifyMaxCount(Q_UINT32, TQCString)", dataCount );
+ "notifyMaxCount(TQ_UINT32, TQCString)", dataCount );
m_settings->m_valueYoungerThan = dialog->spinNewer->value();
m_settings->m_valueOlderThan = dialog->spinOlder->value();
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index c1c98e07a..9b342f20e 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -55,7 +55,7 @@ static const int autoOpenTimeout = 750;
getModule KonqSidebarTree::getPluginFactory(TQString name)
{
- if (!pluginFactories.contains(name))
+ if (!pluginFactories.tqcontains(name))
{
KLibLoader *loader = KLibLoader::self();
TQString libName = pluginInfo[name];
@@ -114,8 +114,8 @@ public:
};
-KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path )
- : KListView( parentWidget ),
+KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path )
+ : KListView( tqparentWidget ),
m_currentTopLevelItem( 0 ),
m_toolTip( this ),
m_scrollingLocked( false ),
@@ -272,7 +272,7 @@ void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e )
TQListViewItem *item = itemAt( contentsToViewport( e->pos() ) );
// Accept drops on the background, if URLs
- if ( !item && m_lstDropFormats.contains("text/uri-list") )
+ if ( !item && m_lstDropFormats.tqcontains("text/uri-list") )
{
m_dropItem = 0;
e->acceptAction();
@@ -417,7 +417,7 @@ bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const
{
// for KListViewMode...
for( int i = 0; e->format( i ); i++ )
- if ( d->m_dropFormats.contains(e->format( i ) ) )
+ if ( d->m_dropFormats.tqcontains(e->format( i ) ) )
return true;
return false;
}
@@ -482,7 +482,7 @@ void KonqSidebarTree::slotExecuted( TQListViewItem *item )
void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col )
{
KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item );
- if (_button == RightButton)
+ if (_button == Qt::RightButton)
{
if ( item && col < 2)
{
@@ -498,10 +498,10 @@ void KonqSidebarTree::slotMouseButtonClicked(int _button, TQListViewItem* _item,
if(_item && col < 2)
{
switch( _button ) {
- case LeftButton:
+ case Qt::LeftButton:
slotExecuted( item );
break;
- case MidButton:
+ case Qt::MidButton:
item->middleButtonClicked();
break;
}
@@ -516,7 +516,7 @@ void KonqSidebarTree::slotAutoOpenFolder()
return;
m_dropItem->setOpen( true );
- m_dropItem->repaint();
+ m_dropItem->tqrepaint();
}
void KonqSidebarTree::rescanConfiguration()
@@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
// Version 5 includes the audiocd browser
// Version 6 includes the printmanager and lan browser
const int currentVersion = 6;
- TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber");
+ TQString key = TQString::tqfromLatin1("X-KDE-DirTreeVersionNumber");
KSimpleConfig versionCfg( path + "/.directory" );
int versionNumber = versionCfg.readNumEntry( key, 1 );
kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
@@ -652,7 +652,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
{
//kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
if ( *eIt != "." && *eIt != ".."
- && !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) )
+ && !entries.tqcontains( *eIt ) && !dirEntries.tqcontains( *eIt ) )
{ // we don't have that one yet -> copy it.
TQString cp("cp -R -- ");
cp += KProcess::quote(dirtree_dir + *eIt);
@@ -813,7 +813,7 @@ void KonqSidebarTree::slotAnimation()
for (; it != end; ++it )
{
uint & iconNumber = it.data().iconNumber;
- TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
+ TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
it.key()->setPixmap( 0, SmallIcon( icon));
iconNumber++;
@@ -836,7 +836,7 @@ void KonqSidebarTree::startAnimation( KonqSidebarTreeItem * item, const char * i
void KonqSidebarTree::stopAnimation( KonqSidebarTreeItem * item )
{
- MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.find(item);
+ MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.tqfind(item);
if ( it != m_mapCurrentOpeningFolders.end() )
{
item->setPixmap( 0, it.data().originalPixmap );
@@ -882,7 +882,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste,
bool KonqSidebarTree::tabSupport()
{
// see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror)
- DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name());
DCOPReply reply = ref.call("functions()");
if (reply.isValid()) {
QCStringList funcs;
@@ -907,21 +907,21 @@ void KonqSidebarTree::showToplevelContextMenu()
if (!m_collection)
{
m_collection = new KActionCollection( this, "bookmark actions" );
- (void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, this,
+ (void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
- (void) new KAction( i18n("Delete Folder"), "editdelete", 0, this,
+ (void) new KAction( i18n("Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
- (void) new KAction( i18n("Rename"), 0, this,
+ (void) new KAction( i18n("Rename"), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotRename() ), m_collection, "rename");
- (void) new KAction( i18n("Delete Link"), "editdelete", 0, this,
+ (void) new KAction( i18n("Delete Link"), "editdelete", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotDelete() ), m_collection, "delete_link");
- (void) new KAction( i18n("Properties"), "edit", 0, this,
+ (void) new KAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotProperties() ), m_collection, "item_properties");
- (void) new KAction( i18n("Open in New Window"), "window_new", 0, this,
+ (void) new KAction( i18n("Open in New Window"), "window_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
- (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this,
+ (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
- (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this,
+ (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
}
@@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow()
void KonqSidebarTree::slotOpenTab()
{
if (!m_currentTopLevelItem) return;
- DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name());
ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() );
}
@@ -1031,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation()
{
if (!m_currentTopLevelItem) return;
KURL url = m_currentTopLevelItem->externalURL();
- kapp->clipboard()->setData( new KURLDrag(url, 0), QClipboard::Selection );
- kapp->clipboard()->setData( new KURLDrag(url, 0), QClipboard::Clipboard );
+ kapp->tqclipboard()->setData( new KURLDrag(url, 0), QClipboard::Selection );
+ kapp->tqclipboard()->setData( new KURLDrag(url, 0), QClipboard::Clipboard );
}
///////////////////////////////////////////////////////////////////
@@ -1045,7 +1045,7 @@ void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point )
if ( item ) {
TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText();
if ( !text.isEmpty() )
- tip ( m_view->itemRect( item ), text );
+ tip ( m_view->tqitemRect( item ), text );
}
}
diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h
index 269803a84..8db2a613e 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -50,7 +50,7 @@ typedef struct DirTreeConfigData_
} DirTreeConfigData;
-class KonqSidebarTreeToolTip : public QToolTip
+class KonqSidebarTreeToolTip : public TQToolTip
{
public:
KonqSidebarTreeToolTip( TQListView *view ) : TQToolTip( view->viewport() ), m_view( view ) {}
@@ -77,7 +77,7 @@ class KonqSidebarTree : public KListView, public KDirNotify
{
Q_OBJECT
public:
- KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path );
+ KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path );
virtual ~KonqSidebarTree();
void followURL( const KURL &url );
diff --git a/konqueror/sidebar/trees/konq_sidebartreeitem.h b/konqueror/sidebar/trees/konq_sidebartreeitem.h
index d39743b90..9fc313af2 100644
--- a/konqueror/sidebar/trees/konq_sidebartreeitem.h
+++ b/konqueror/sidebar/trees/konq_sidebartreeitem.h
@@ -37,7 +37,7 @@ class KonqSidebarTreeTopLevelItem;
* Items belonging to a given module are created and managed by the module,
* but they should all be KonqSidebarTreeItems, for the event handling in KonqSidebarTree.
*/
-class KonqSidebarTreeItem : public QListViewItem
+class KonqSidebarTreeItem : public TQListViewItem
{
public:
// Create an item under another one
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 4ce6fe445..91d4d1eb5 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -50,14 +50,14 @@ void KonqSidebarTreeTopLevelItem::setOpen( bool open )
void KonqSidebarTreeTopLevelItem::itemSelected()
{
kdDebug() << "KonqSidebarTreeTopLevelItem::itemSelected" << endl;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
bool paste = m_bTopLevelGroup && data->provides("text/uri-list");
tree()->enableActions( true, true, paste, true, true, true /*rename*/ );
}
bool KonqSidebarTreeTopLevelItem::acceptsDrops( const TQStrList & formats )
{
- return formats.contains("text/uri-list") &&
+ return formats.tqcontains("text/uri-list") &&
( m_bTopLevelGroup || !externalURL().isEmpty() );
}
@@ -157,7 +157,7 @@ void KonqSidebarTreeTopLevelItem::paste()
{
// move or not move ?
bool move = false;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 219063026..916e152fd 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -75,14 +75,14 @@ void KonqSidebar_Tree::cut()
{
TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L, true );
if (drag)
- TQApplication::clipboard()->setData( drag );
+ TQApplication::tqclipboard()->setData( drag );
}
void KonqSidebar_Tree::copy()
{
TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L );
if (drag)
- TQApplication::clipboard()->setData( drag );
+ TQApplication::tqclipboard()->setData( drag );
}
void KonqSidebar_Tree::paste()
@@ -147,7 +147,7 @@ extern "C"
i18n( "Select type:" ), names );
if (!item.isEmpty())
{
- int id=names.findIndex( item );
+ int id=names.tqfindIndex( item );
if (id==-1) return false;
KSimpleConfig ksc2(*list.at(id));
ksc2.setGroup("Desktop Entry");
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index eb10414a9..36109ff86 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -82,7 +82,7 @@ class KHTMLSideBar : public KHTMLPart
virtual void urlSelected( const TQString &url, int button,
int state, const TQString &_target,
KParts::URLArgs args = KParts::URLArgs()) {
- if (button == LeftButton ){
+ if (button == Qt::LeftButton ){
if (_target.lower() == "_self") {
openURL(url);
} else if (_target.lower() == "_blank") {
@@ -92,7 +92,7 @@ class KHTMLSideBar : public KHTMLPart
}
return;
}
- if (button == MidButton) {
+ if (button == Qt::MidButton) {
emit openURLNewWindow(completeURL(url).url(),
args);
return;