summaryrefslogtreecommitdiffstats
path: root/konqueror
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /konqueror
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konqueror')
-rw-r--r--konqueror/ChangeLog6
-rw-r--r--konqueror/DESIGN6
-rw-r--r--konqueror/IDEAS2
-rw-r--r--konqueror/KonquerorIface.cc18
-rw-r--r--konqueror/about/konq_aboutpage.cc28
-rw-r--r--konqueror/about/konq_aboutpage.h4
-rw-r--r--konqueror/about/launch.html2
-rw-r--r--konqueror/about/specs.html2
-rw-r--r--konqueror/client/kfmclient.cc58
-rw-r--r--konqueror/iconview/konq_iconview.cc28
-rw-r--r--konqueror/iconview/konq_iconview.h2
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp8
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.cpp4
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.h2
-rw-r--r--konqueror/keditbookmarks/commands.cpp6
-rw-r--r--konqueror/keditbookmarks/commands.h2
-rw-r--r--konqueror/keditbookmarks/dcop.cpp4
-rw-r--r--konqueror/keditbookmarks/favicons.cpp8
-rw-r--r--konqueror/keditbookmarks/importers.cpp12
-rw-r--r--konqueror/keditbookmarks/keditbookmarks.kcfg2
-rw-r--r--konqueror/keditbookmarks/listview.cpp26
-rw-r--r--konqueror/keditbookmarks/listview.h20
-rw-r--r--konqueror/keditbookmarks/main.cpp6
-rw-r--r--konqueror/keditbookmarks/testlink.cpp36
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp16
-rw-r--r--konqueror/keditbookmarks/toplevel.h2
-rw-r--r--konqueror/konq_actions.cc4
-rw-r--r--konqueror/konq_combo.cc28
-rw-r--r--konqueror/konq_extensionmanager.cc2
-rw-r--r--konqueror/konq_factory.cc14
-rw-r--r--konqueror/konq_factory.h2
-rw-r--r--konqueror/konq_frame.cc94
-rw-r--r--konqueror/konq_frame.h20
-rw-r--r--konqueror/konq_guiclients.cc8
-rw-r--r--konqueror/konq_main.cc6
-rw-r--r--konqueror/konq_mainwindow.cc160
-rw-r--r--konqueror/konq_mainwindow.h4
-rw-r--r--konqueror/konq_misc.cc4
-rw-r--r--konqueror/konq_profiledlg.cc4
-rw-r--r--konqueror/konq_tabs.cc8
-rw-r--r--konqueror/konq_view.cc16
-rw-r--r--konqueror/konq_view.h2
-rw-r--r--konqueror/konq_viewmgr.cc62
-rw-r--r--konqueror/konq_viewmgr.h8
-rw-r--r--konqueror/konqueror.kcfg2
-rw-r--r--konqueror/listview/konq_infolistviewitem.cc4
-rw-r--r--konqueror/listview/konq_infolistviewitem.h2
-rw-r--r--konqueror/listview/konq_infolistviewwidget.cc4
-rw-r--r--konqueror/listview/konq_infolistviewwidget.h2
-rw-r--r--konqueror/listview/konq_listview.cc14
-rw-r--r--konqueror/listview/konq_listview.h4
-rw-r--r--konqueror/listview/konq_listviewitems.cc16
-rw-r--r--konqueror/listview/konq_listviewitems.h2
-rw-r--r--konqueror/listview/konq_listviewwidget.cc38
-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.cc4
-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.cpp2
-rw-r--r--konqueror/shellcmdplugin/kshellcmddialog.cpp8
-rw-r--r--konqueror/sidebar/Makefile.am2
-rw-r--r--konqueror/sidebar/konqsidebar.cpp8
-rw-r--r--konqueror/sidebar/konqsidebar.h4
-rw-r--r--konqueror/sidebar/konqsidebarplugin.h2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp60
-rw-r--r--konqueror/sidebar/sidebar_widget.h4
-rw-r--r--konqueror/sidebar/test/Makefile.am2
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp6
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp8
-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.ui12
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.cpp6
-rw-r--r--konqueror/sidebar/trees/history_module/history_item.h2
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp8
-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/init/home.desktop2
-rw-r--r--konqueror/sidebar/trees/init/system.desktop4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp26
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.h2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp2
86 files changed, 533 insertions, 533 deletions
diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog
index 438da0d6..42e14ecb 100644
--- a/konqueror/ChangeLog
+++ b/konqueror/ChangeLog
@@ -22,7 +22,7 @@
* konq_actions.h (class KonqGoURLAction): new class, derived
from KAction, used for the 'go url' action. when plugging the
action into a toolbar make sure to align the button right.
- Otherwise the toolbar layout completely fucks up and QToolBar
+ Otherwise the toolbar tqlayout completely fucks up and QToolBar
starts flickering like mad, when the window width is getting
small than the lenght of the url in the combobox.
@@ -57,8 +57,8 @@
* konq_mainwindow.cc (slotShowMenuBar): call saveMainWindowSettings and
KGlobal::config()->sync() after toggling the visiblity of the menubar,
just like it is done for toolbars.
- (slotPartActivated): connect and disconnect to/from the actionStatusText
- and clearStatusText signals of the part's actioncollection
+ (slotPartActivated): connect and disconnect to/from the actiontqStatusText
+ and cleartqStatusText signals of the part's actioncollection
2001-03-02 Simon Hausmann <simon@kde.org>
diff --git a/konqueror/DESIGN b/konqueror/DESIGN
index fb2628aa..067e0e75 100644
--- a/konqueror/DESIGN
+++ b/konqueror/DESIGN
@@ -14,9 +14,9 @@ icon views, tree views, html views...)
The main(), including all the startup mechanism is in konq_main.*
-The main window contains several "views", in order to show several URLs
+The main window tqcontains several "views", in order to show several URLs
at once, possibly using several modes. Each view is a KonqView.
-The KonqView contains the child part, which can be :
+The KonqView tqcontains the child part, which can be :
- an icon view (KonqIconView)
- a list view / tree view (KonqListView/KonqTreeView)
- an HTML view (KHTMLPart)
@@ -76,7 +76,7 @@ How history is implemented
From the konqueror side:
-* KonqView has a list of history items. Each item contains a URL,
+* KonqView has a list of history items. Each item tqcontains a URL,
and a QByteArray for the view to store its stuff in the format that suits it best.
It calls saveState() at various points of time (right after starting loading the URL,
when the loading is completed, and right before loading another URL). Reason:
diff --git a/konqueror/IDEAS b/konqueror/IDEAS
index 426b4d00..017c181e 100644
--- a/konqueror/IDEAS
+++ b/konqueror/IDEAS
@@ -162,7 +162,7 @@ plus it's own toolbar.
This integration is in fact not sooo seamless because:
whenever the use activates your khelpcenter part
a complete GUI "switch" will take place, meaning all the *bars from
-konqueror will be replaced by the *bars from the child view
+konqueror will be tqreplaced by the *bars from the child view
Therefor another approach is developed:
The *bars of konqueror will contain entries for all child-views which are
diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc
index ce785096..a2278885 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 c9c83fd4..e7b0553b 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:") +
+ TQString basehref = TQString::tqfromLatin1("<BASE HREF=\"file:") +
file.left( file.findRev( '/' )) +
- TQString::fromLatin1("/\">\n");
+ 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 c72a8525..3d53cf02 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/launch.html b/konqueror/about/launch.html
index 9acc5d6a..ed78e44f 100644
--- a/konqueror/about/launch.html
+++ b/konqueror/about/launch.html
@@ -60,7 +60,7 @@
<div id="boxCenter">
<table border="0" align="center">
-<!--search bar argument replacement is performed between the "search bar splitter" lines-->
+<!--search bar argument tqreplacement is performed between the "search bar splitter" lines-->
<!--search bar splitter-->
<tr>
diff --git a/konqueror/about/specs.html b/konqueror/about/specs.html
index b0421206..4989754c 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 60a38410..2e95106e 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 "";
@@ -271,7 +271,7 @@ static TQCString konqyToReuse( const TQString& url, const TQString& mimetype, co
TQByteArray data;
TQDataStream str( data, IO_WriteOnly );
str << currentScreen();
- if( !KApplication::dcopClient()->findObject( "konqueror*", "KonquerorIface",
+ if( !KApplication::dcopClient()->tqfindObject( "konqueror*", "KonquerorIface",
"processCanBeReused( int )", data, ret, appObj, false, 3000 ) )
return "";
return ret;
@@ -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,14 +330,14 @@ 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 ) )
{
TQCString foundApp, foundObj;
TQByteArray data;
TQDataStream str( data, IO_WriteOnly );
- if( KApplication::dcopClient()->findObject( "konqueror*", "konqueror-mainwindow*",
+ if( KApplication::dcopClient()->tqfindObject( "konqueror*", "konqueror-mainwindow*",
"windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000 ) )
{
DCOPRef ref( foundApp, foundObj );
@@ -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,17 +391,17 @@ 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;
}
// startServiceByDesktopPath waits for the app to register with DCOP
- // so when we arrive here, konq is up and running already, and appId contains the identification
+ // so when we arrive here, konq is up and running already, and appId tqcontains 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() );
@@ -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 );
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index cf567c33..e075838f 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() ),
@@ -313,8 +313,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
this, TQT_SLOT( slotInvertSelection() ),
actionCollection(), "invertselection" );
- m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given mask" ) );
- m_paUnselect->setToolTip( i18n( "Allows unselecting of file or folder items based on a given mask" ) );
+ m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given tqmask" ) );
+ m_paUnselect->setToolTip( i18n( "Allows unselecting of file or folder items based on a given tqmask" ) );
m_paSelectAll->setToolTip( i18n( "Selects all items" ) );
m_paUnselectAll->setToolTip( i18n( "Unselects all selected items" ) );
m_paInvertSelection->setToolTip( i18n( "Inverts the current selection of items" ) );
@@ -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() ) );
@@ -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
@@ -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)
@@ -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 tqreplace 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 51773418..b1ac6df9 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 2aafe885..cdd790f0 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -157,11 +157,11 @@ void KEBApp::createActions() {
i18n("&Open in Konqueror"), "fileopen", 0,
actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
(void) new KAction(
- i18n("Check &Status"), "bookmark", 0,
+ i18n("Check &tqStatus"), "bookmark", 0,
actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
(void) new KAction(
- i18n("Check Status: &All"), 0,
+ i18n("Check tqStatus: &All"), 0,
actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
(void) new KAction(
i18n("Update All &Favicons"), 0,
@@ -237,7 +237,7 @@ void CurrentMgr::doExport(ExportType type, const TQString & _path) {
// TODO - add a factory and make all this use the base class
if (type == OperaExport) {
if (path.isNull())
- path = KOperaBookmarkImporterImpl().findDefaultLocation(true);
+ path = KOperaBookmarkImporterImpl().tqfindDefaultLocation(true);
KOperaBookmarkExporterImpl exporter(mgr(), path);
exporter.write(mgr()->root());
return;
@@ -253,7 +253,7 @@ void CurrentMgr::doExport(ExportType type, const TQString & _path) {
} else if (type == IEExport) {
if (path.isNull())
- path = KIEBookmarkImporterImpl().findDefaultLocation(true);
+ path = KIEBookmarkImporterImpl().tqfindDefaultLocation(true);
KIEBookmarkExporterImpl exporter(mgr(), path);
exporter.write(mgr()->root());
return;
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index edc4a66b..b4d6d6f3 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -106,11 +106,11 @@ void BookmarkInfoWidget::showBookmark(const KBookmark &bk) {
NodeEditCommand::getNodeText(bk, TQStringList() << "desc"));
// readonly fields
- updateStatus();
+ updatetqStatus();
}
-void BookmarkInfoWidget::updateStatus()
+void BookmarkInfoWidget::updatetqStatus()
{
TQString visitDate =
CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, TQStringList() << "info" << "metadata"
diff --git a/konqueror/keditbookmarks/bookmarkinfo.h b/konqueror/keditbookmarks/bookmarkinfo.h
index 8565616e..bc3ee9f3 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.h
+++ b/konqueror/keditbookmarks/bookmarkinfo.h
@@ -47,7 +47,7 @@ public:
KBookmark bookmark() { return m_bk; }
bool connected() { return m_connected; };
void setConnected(bool b) { m_connected = b; };
- void updateStatus();
+ void updatetqStatus();
public slots:
void slotTextChangedURL(const TQString &);
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index 2ad58a68..c7c5f83a 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/commands.h b/konqueror/keditbookmarks/commands.h
index 3df5d3ac..f7fd468a 100644
--- a/konqueror/keditbookmarks/commands.h
+++ b/konqueror/keditbookmarks/commands.h
@@ -1,4 +1,4 @@
-// kate: space-indent on; indent-width 3; replace-tabs on;
+// kate: space-indent on; indent-width 3; tqreplace-tabs on;
/* This file is part of the KDE project
Copyright (C) 2000 David Faure <faure@kde.org>
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp
index a31af0c8..c3093080 100644
--- a/konqueror/keditbookmarks/dcop.cpp
+++ b/konqueror/keditbookmarks/dcop.cpp
@@ -59,8 +59,8 @@ void KBookmarkEditorIface::slotDcopUpdatedAccessMetadata(TQString filename, TQSt
kdDebug() << "slotDcopUpdatedAccessMetadata(" << url << ")" << endl;
// no undo
CurrentMgr::self()->mgr()->updateAccessMetadata(url, false);
- ListView::self()->updateStatus(url);
- KEBApp::self()->updateStatus(url);
+ ListView::self()->updatetqStatus(url);
+ KEBApp::self()->updatetqStatus(url);
// notice - no save here! see! :)
}
}
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index b9b9b4ea..6b44fb0a 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -66,13 +66,13 @@ FavIconsItr::FavIconsItr(TQValueList<KBookmark> bks)
FavIconsItr::~FavIconsItr() {
if (curItem())
- curItem()->restoreStatus();
+ curItem()->restoretqStatus();
delete m_updater;
}
void FavIconsItr::slotDone(bool succeeded) {
// kdDebug() << "FavIconsItr::slotDone()" << endl;
- curItem()->setTmpStatus(succeeded ? i18n("OK") : i18n("No favicon found"));
+ curItem()->setTmptqStatus(succeeded ? i18n("OK") : i18n("No favicon found"));
holder()->addAffectedBookmark(KBookmark::parentAddress(curBk().address()));
delayedEmitNextOne();
}
@@ -83,7 +83,7 @@ bool FavIconsItr::isApplicable(const KBookmark &bk) const {
void FavIconsItr::doAction() {
// kdDebug() << "FavIconsItr::doAction()" << endl;
- curItem()->setTmpStatus(i18n("Updating favicon..."));
+ curItem()->setTmptqStatus(i18n("Updating favicon..."));
if (!m_updater) {
m_updater = new FavIconUpdater(kapp, "FavIconUpdater");
connect(m_updater, TQT_SIGNAL( done(bool) ),
@@ -92,7 +92,7 @@ void FavIconsItr::doAction() {
if (curBk().url().protocol().startsWith("http")) {
m_updater->downloadIcon(curBk());
} else {
- curItem()->setTmpStatus(i18n("Local file"));
+ curItem()->setTmptqStatus(i18n("Local file"));
delayedEmitNextOne();
}
}
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 4df0d237..18839848 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -73,7 +73,7 @@ ImportCommand* ImportCommand::performImport(const TQCString &type, TQWidget *top
int answer =
KMessageBox::questionYesNoCancel(
- top, i18n("Import as a new subfolder or replace all the current bookmarks?"),
+ top, i18n("Import as a new subfolder or tqreplace all the current bookmarks?"),
i18n("%1 Import").arg(importer->visibleName()),
i18n("As New Folder"), i18n("Replace"));
@@ -149,27 +149,27 @@ TQString ImportCommand::affectedBookmarks() const
TQString MozImportCommand::requestFilename() const {
static KMozillaBookmarkImporterImpl importer;
- return importer.findDefaultLocation();
+ return importer.tqfindDefaultLocation();
}
TQString NSImportCommand::requestFilename() const {
static KNSBookmarkImporterImpl importer;
- return importer.findDefaultLocation();
+ return importer.tqfindDefaultLocation();
}
TQString OperaImportCommand::requestFilename() const {
static KOperaBookmarkImporterImpl importer;
- return importer.findDefaultLocation();
+ return importer.tqfindDefaultLocation();
}
TQString CrashesImportCommand::requestFilename() const {
static KCrashBookmarkImporterImpl importer;
- return importer.findDefaultLocation();
+ return importer.tqfindDefaultLocation();
}
TQString IEImportCommand::requestFilename() const {
static KIEBookmarkImporterImpl importer;
- return importer.findDefaultLocation();
+ return importer.tqfindDefaultLocation();
}
// following two are really just xbel
diff --git a/konqueror/keditbookmarks/keditbookmarks.kcfg b/konqueror/keditbookmarks/keditbookmarks.kcfg
index 16da3d8b..60c5f593 100644
--- a/konqueror/keditbookmarks/keditbookmarks.kcfg
+++ b/konqueror/keditbookmarks/keditbookmarks.kcfg
@@ -39,4 +39,4 @@
</entry>
</group>
-</kcfg> \ No newline at end of file
+</kcfg>
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 1fa31e96..554f06b9 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -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();
}
}
@@ -277,7 +277,7 @@ void ListView::deselectAllChildren(KEBListViewItem *item)
else
deselectAllChildren(child);
}
- child->repaint();
+ child->tqrepaint();
child = static_cast<KEBListViewItem *>(child->nextSibling());
}
}
@@ -436,7 +436,7 @@ void ListView::handleDropped(KEBListView *, TQDropEvent *e, TQListViewItem *newP
CmdHistory::self()->didCommand(mcmd);
}
-void ListView::updateStatus(TQString url) {
+void ListView::updatetqStatus(TQString url) {
m_listView->updateByURL(url);
}
@@ -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);
@@ -670,7 +670,7 @@ void KEBListView::loadColumnSetting()
header()->resizeSection(KEBListView::NameColumn, KEBSettings::name());
header()->resizeSection(KEBListView::UrlColumn, KEBSettings::uRL());
header()->resizeSection(KEBListView::CommentColumn, KEBSettings::comment());
- header()->resizeSection(KEBListView::StatusColumn, KEBSettings::status());
+ header()->resizeSection(KEBListView::tqStatusColumn, KEBSettings::status());
#ifdef DEBUG_ADDRESSES
header()->resizeSection(KEBListView::AddressColumn, KEBSettings::address());
#endif
@@ -683,7 +683,7 @@ void KEBListView::saveColumnSetting ()
KEBSettings::setName( header()->sectionSize(KEBListView::NameColumn));
KEBSettings::setURL( header()->sectionSize(KEBListView::UrlColumn));
KEBSettings::setComment( header()->sectionSize(KEBListView::CommentColumn));
- KEBSettings::setStatus( header()->sectionSize(KEBListView::StatusColumn));
+ KEBSettings::setStatus( header()->sectionSize(KEBListView::tqStatusColumn));
#ifdef DEBUG_ADDRESSES
KEBSettings::setAddress( header()->sectionSize(KEBListView::AddressColumn));
#endif
@@ -702,7 +702,7 @@ void KEBListView::init() {
addColumn(i18n("Bookmark"), 0); // KEBListView::NameColumn
addColumn(i18n("URL"), 0);
addColumn(i18n("Comment"), 0);
- addColumn(i18n("Status"), 0);
+ addColumn(i18n("tqStatus"), 0);
#ifdef DEBUG_ADDRESSES
addColumn(i18n("Address"), 0);
#endif
@@ -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;
@@ -939,7 +939,7 @@ void KEBListViewItem::paintCell(TQPainter *p, const TQColorGroup &ocg, int col,
cg.setColor(TQColorGroup::Base, col);
}
- if (col == KEBListView::StatusColumn) {
+ if (col == KEBListView::tqStatusColumn) {
switch (m_paintStyle) {
case KEBListViewItem::GreyStyle:
{
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index 0ca0edf3..3e611053 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -1,4 +1,4 @@
-// kate: space-indent on; indent-width 3; replace-tabs on;
+// kate: space-indent on; indent-width 3; tqreplace-tabs on;
/* This file is part of the KDE project
Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
@@ -52,11 +52,11 @@ public:
void modUpdate();
- void setOldStatus(const TQString &);
- void setTmpStatus(const TQString &);
- void restoreStatus();
+ void setOldtqStatus(const TQString &);
+ void setTmptqStatus(const TQString &);
+ void restoretqStatus();
- 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);
@@ -75,7 +75,7 @@ private:
KBookmark m_bookmark;
PaintStyle m_paintStyle;
bool m_emptyFolderPadder;
- TQString m_oldStatus;
+ TQString m_oldtqStatus;
void greyStyle(TQColorGroup &);
void boldStyle(TQPainter *);
};
@@ -88,7 +88,7 @@ public:
NameColumn = 0,
UrlColumn = 1,
CommentColumn = 2,
- StatusColumn = 3,
+ tqStatusColumn = 3,
AddressColumn = 4
};
KEBListView(TQWidget *parent, bool folderList)
@@ -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;
@@ -172,7 +172,7 @@ public:
void rename(int);
void clearSelection();
- void updateStatus(TQString url);
+ void updatetqStatus(TQString url);
static ListView* self() { return s_self; }
static void createListViews(TQSplitter *parent);
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 3416e7e0..e0a2ae01 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);
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 0d7d0ddf..f6d39680 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -73,7 +73,7 @@ TestLinkItr::TestLinkItr(TQValueList<KBookmark> bks)
TestLinkItr::~TestLinkItr() {
if (m_job) {
// kdDebug() << "JOB kill\n";
- curItem()->restoreStatus();
+ curItem()->restoretqStatus();
m_job->disconnect();
m_job->kill(false);
}
@@ -95,9 +95,9 @@ void TestLinkItr::doAction() {
connect(m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &)),
this, TQT_SLOT( slotJobData(KIO::Job *, const TQByteArray &)));
- curItem()->setTmpStatus(i18n("Checking..."));
+ curItem()->setTmptqStatus(i18n("Checking..."));
TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url());
- curItem()->setOldStatus(oldModDate);
+ curItem()->setOldtqStatus(oldModDate);
TestLinkItrHolder::self()->setMod(curBk().url().url(), i18n("Checking..."));
}
@@ -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;
}
@@ -347,7 +347,7 @@ void KEBListViewItem::nsPut(const TQString &newModDate) {
TQString blah = updateNsInfoMod(info, newModDate);
m_bookmark.internalElement().setAttribute(NetscapeInfoAttribute, blah);
TestLinkItrHolder::self()->setMod(m_bookmark.url().url(), newModDate);
- setText(KEBListView::StatusColumn, newModDate);
+ setText(KEBListView::tqStatusColumn, newModDate);
}
// KEBListViewItem !!!!!!!!!!!
@@ -365,29 +365,29 @@ void KEBListViewItem::modUpdate() {
TQString statusLine;
statusLine = TestLinkItrHolder::calcPaintStyle(m_bookmark.url().url(), m_paintStyle, iVisit, oldModify);
if (statusLine != "Error")
- setText(KEBListView::StatusColumn, statusLine);
+ setText(KEBListView::tqStatusColumn, statusLine);
}
/* -------------------------- */
// KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::setOldStatus(const TQString &oldStatus) {
- // kdDebug() << "KEBListViewItem::setOldStatus" << endl;
- m_oldStatus = oldStatus;
+void KEBListViewItem::setOldtqStatus(const TQString &oldtqStatus) {
+ // kdDebug() << "KEBListViewItem::setOldtqStatus" << endl;
+ m_oldtqStatus = oldtqStatus;
}
// KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::setTmpStatus(const TQString &status) {
- // kdDebug() << "KEBListViewItem::setTmpStatus" << endl;
+void KEBListViewItem::setTmptqStatus(const TQString &status) {
+ // kdDebug() << "KEBListViewItem::setTmptqStatus" << endl;
m_paintStyle = KEBListViewItem::BoldStyle;
- setText(KEBListView::StatusColumn, status);
+ setText(KEBListView::tqStatusColumn, status);
}
// KEBListViewItem !!!!!!!!!!!
-void KEBListViewItem::restoreStatus() {
- if (!m_oldStatus.isNull()) {
- // kdDebug() << "KEBListViewItem::restoreStatus" << endl;
- TestLinkItrHolder::self()->resetToValue(m_bookmark.url().url(), m_oldStatus);
+void KEBListViewItem::restoretqStatus() {
+ if (!m_oldtqStatus.isNull()) {
+ // kdDebug() << "KEBListViewItem::restoretqStatus" << endl;
+ TestLinkItrHolder::self()->resetToValue(m_bookmark.url().url(), m_oldtqStatus);
modUpdate();
}
}
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 4a505d49..3af294f2 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()
@@ -122,7 +122,7 @@ void CmdHistory::clearHistory() {
CurrentMgr *CurrentMgr::s_mgr = 0;
KBookmark CurrentMgr::bookmarkAt(const TQString &a) {
- return self()->mgr()->findByAddress(a);
+ return self()->mgr()->tqfindByAddress(a);
}
bool CurrentMgr::managerSave() { return mgr()->save(); }
@@ -184,7 +184,7 @@ TQString CurrentMgr::makeTimeStr(int b)
{
TQDateTime dt;
dt.setTime_t(b);
- return (dt.daysTo(TQDateTime::currentDateTime()) > 31)
+ return (dt.daysTo(TQDateTime::tqcurrentDateTime()) > 31)
? KGlobal::locale()->formatDate(dt.date(), false)
: KGlobal::locale()->formatDateTime(dt, false);
}
@@ -233,11 +233,11 @@ KEBApp::KEBApp(
vsplitter->setOrientation(TQSplitter::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)
@@ -276,10 +276,10 @@ void KEBApp::construct() {
setAutoSaveSettings();
}
-void KEBApp::updateStatus(TQString url)
+void KEBApp::updatetqStatus(TQString url)
{
if(m_bkinfo->bookmark().url() == url)
- m_bkinfo->updateStatus();
+ m_bkinfo->updatetqStatus();
}
KEBApp::~KEBApp() {
diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h
index 7b1ec5f8..22ed74ec 100644
--- a/konqueror/keditbookmarks/toplevel.h
+++ b/konqueror/keditbookmarks/toplevel.h
@@ -116,7 +116,7 @@ public:
KEBApp(const TQString & bookmarksFile, bool readonly, const TQString &address, bool browser, const TQString &caption);
virtual ~KEBApp();
- void updateStatus(TQString url);
+ void updatetqStatus(TQString url);
void setActionsEnabled(SelcAbilities);
void setCancelFavIconUpdatesEnabled(bool);
diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc
index 7cb8a614..3314d15e 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
@@ -103,7 +103,7 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index )
connect( m_goMenu, TQT_SIGNAL( activated( int ) ),
this, TQT_SLOT( slotActivated( int ) ) );
//kdDebug(1202) << "m_goMenu->count()=" << m_goMenu->count() << endl;
- // Store how many items the menu already contains.
+ // Store how many items the menu already tqcontains.
// This means, the KonqBidiHistoryAction has to be plugged LAST in a menu !
m_firstIndex = m_goMenu->count();
return m_goMenu->count(); // hmmm, what should this be ?
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index 0a73e6c8..0cbab502 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -99,7 +99,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
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();
}
@@ -540,7 +540,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
if ( e->button() == 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( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
if ( x > x0 + 2 && x < lineEdit()->x() ) {
m_dragStart = e->pos();
@@ -551,7 +551,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
if ( e->button() == 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( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x();
if ( x < x0 )
emit showPageSecurity();
@@ -605,7 +605,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe )
TQLineEdit *edit = lineEdit();
TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField );
- re = TQStyle::visualRect(re, this);
+ re = TQStyle::tqvisualRect(re, this);
if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) {
TQColor color(245, 246, 190);
@@ -620,9 +620,9 @@ void KonqCombo::paintEvent( TQPaintEvent *pe )
p.drawPixmap( re.x() + 2, re.y() + ( re.height() - pix.height() ) / 2, pix );
}
- TQRect r = edit->geometry();
+ TQRect r = edit->tqgeometry();
r.setRight( re.right() - pix.width() - 4 );
- if ( r != edit->geometry() )
+ if ( r != edit->tqgeometry() )
edit->setGeometry( r );
if ( useColor)
@@ -635,9 +635,9 @@ void KonqCombo::paintEvent( TQPaintEvent *pe )
p.setClipping( FALSE );
}
else {
- TQRect r = edit->geometry();
+ TQRect r = edit->tqgeometry();
r.setRight( re.right() );
- if ( r != edit->geometry() )
+ if ( r != edit->tqgeometry() )
edit->setGeometry( r );
edit->setPaletteBackgroundColor( TQApplication::palette( edit ).color( TQPalette::Active, TQColorGroup::Base ) );
}
@@ -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)
@@ -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()->style().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) -
+ 2 * listBox()->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
int titleWidth = ( entryWidth / 3 ) - 1;
int urlWidth = entryWidth - titleWidth - pmWidth - 2;
@@ -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 d6d9f71a..42b117af 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cc
@@ -65,7 +65,7 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai
if ( activePart ) {
KInstance* instance = activePart->instance();
d->pluginSelector->addPlugins(instance->instanceName(), i18n("Tools"), "Tools", instance->config());
- d->pluginSelector->addPlugins(instance->instanceName(), i18n("Statusbar"), "Statusbar", instance->config());
+ d->pluginSelector->addPlugins(instance->instanceName(), i18n("tqStatusbar"), "tqStatusbar", instance->config());
}
}
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc
index 8dfee7f8..8417bf58 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,18 +56,18 @@ 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( tqparentWidget, name, "Browser/View", m_args );
if ( !obj )
- obj = m_factory->create( parentWidget, name, "KParts::ReadOnlyPart", m_args );
+ obj = m_factory->create( tqparentWidget, name, "KParts::ReadOnlyPart", m_args );
}
if ( !obj->inherits( "KParts::ReadOnlyPart" ) )
@@ -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 ac24061e..1f7834d6 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 ef474a4c..265aa0d1 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->installEventFilter(this);
- addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label
+ m_ptqStatusLabel = new KSqueezedTextLabel( this );
+ m_ptqStatusLabel->setMinimumSize( 0, 0 );
+ m_ptqStatusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
+ m_ptqStatusLabel->installEventFilter(this);
+ addWidget( m_ptqStatusLabel, 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->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 "
@@ -99,7 +99,7 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
addWidget( m_progressBar, 0, true /*permanent->right align*/ );
// // FIXME: This was added by OpenSUSE; someone needs to figure out what it does and how to fix it!
-// StatusBarNetworkStatusIndicator * indicator = new StatusBarNetworkStatusIndicator( this, "networkstatusindicator" );
+// StatusBarNetworktqStatusIndicator * indicator = new StatusBarNetworktqStatusIndicator( this, "networkstatusindicator" );
// addWidget( indicator, 0, false );
// indicator->init();
@@ -118,7 +118,7 @@ void KonqFrameStatusBar::fontChange(const TQFont & /* oldFont */)
m_led->setFixedHeight( h + 2 );
m_progressBar->setFixedHeight( h + 2 );
// This one is important. Otherwise richtext messages make it grow in height.
- m_pStatusLabel->setFixedHeight( h + 2 );
+ m_ptqStatusLabel->setFixedHeight( h + 2 );
}
@@ -173,7 +173,7 @@ void KonqFrameStatusBar::splitFrameMenu()
bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e)
{
- if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress)
+ if (o == m_ptqStatusLabel && e->type()==TQEvent::MouseButtonPress)
{
emit clicked();
update();
@@ -184,7 +184,7 @@ bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e)
else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange )
{
unsetPalette();
- updateActiveStatus();
+ updateActivetqStatus();
return true;
}
@@ -197,21 +197,21 @@ void KonqFrameStatusBar::message( const TQString &msg )
// it really looks ugly (the label border goes away, the active-view indicator
// is hidden...)
TQString saveMsg = m_savedMessage;
- slotDisplayStatusText( msg );
+ slotDisplaytqStatusText( msg );
m_savedMessage = saveMsg;
}
-void KonqFrameStatusBar::slotDisplayStatusText(const TQString& text)
+void KonqFrameStatusBar::slotDisplaytqStatusText(const TQString& text)
{
- //kdDebug(1202)<<"KonqFrameHeader::slotDisplayStatusText("<<text<<")"<<endl;
- //m_pStatusLabel->resize(fontMetrics().width(text),fontMetrics().height()+2);
- m_pStatusLabel->setText(text);
+ //kdDebug(1202)<<"KonqFrameHeader::slotDisplaytqStatusText("<<text<<")"<<endl;
+ //m_ptqStatusLabel->resize(fontMetrics().width(text),fontMetrics().height()+2);
+ m_ptqStatusLabel->setText(text);
m_savedMessage = text;
}
void KonqFrameStatusBar::slotClear()
{
- slotDisplayStatusText( m_savedMessage );
+ slotDisplaytqStatusText( m_savedMessage );
}
void KonqFrameStatusBar::slotLoadingProgress( int percent )
@@ -236,20 +236,20 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond )
else
sizeStr = i18n( "Stalled" );
- slotDisplayStatusText( sizeStr ); // let's share the same label...
+ slotDisplaytqStatusText( sizeStr ); // let's share the same label...
}
void KonqFrameStatusBar::slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *newOne)
{
if (newOne!=0)
- connect(newOne,TQT_SIGNAL(setStatusBarText(const TQString &)),this,TQT_SLOT(slotDisplayStatusText(const TQString&)));
- slotDisplayStatusText( TQString::null );
+ connect(newOne,TQT_SIGNAL(setStatusBarText(const TQString &)),this,TQT_SLOT(slotDisplaytqStatusText(const TQString&)));
+ slotDisplaytqStatusText( TQString::null );
}
void KonqFrameStatusBar::showActiveViewIndicator( bool b )
{
m_led->setShown( b );
- updateActiveStatus();
+ updateActivetqStatus();
}
void KonqFrameStatusBar::showLinkedViewIndicator( bool b )
@@ -264,7 +264,7 @@ void KonqFrameStatusBar::setLinkedView( bool b )
m_pLinkedViewCheckBox->blockSignals( false );
}
-void KonqFrameStatusBar::updateActiveStatus()
+void KonqFrameStatusBar::updateActivetqStatus()
{
if ( !m_led->isShown() )
{
@@ -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 );
@@ -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 );
}
@@ -661,7 +661,7 @@ void KonqFrameContainer::removeChildFrame( KonqFrameBase * frame )
void KonqFrameContainer::childEvent( TQChildEvent *c )
{
- // Child events cause layout changes. These are unnecassery if we are going
+ // Child events cause tqlayout changes. These are unnecassery if we are going
// to be deleted anyway.
if (!m_bAboutToBeDeleted)
TQSplitter::childEvent(c);
diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h
index c695515e..b07859ec 100644
--- a/konqueror/konq_frame.h
+++ b/konqueror/konq_frame.h
@@ -59,7 +59,7 @@ namespace KParts
/**
* A CheckBox with a special paintEvent(). It looks like the
- * unchecked radiobutton in b2k style if unchecked and contains a little
+ * unchecked radiobutton in b2k style if unchecked and tqcontains a little
* anchor if checked.
*/
class KonqCheckBox : public QCheckBox
@@ -101,13 +101,13 @@ class KonqFrameStatusBar : public KStatusBar
/**
* Updates the active-view indicator and the statusbar color.
*/
- void updateActiveStatus();
+ void updateActivetqStatus();
public slots:
void slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *oldOne,KParts::ReadOnlyPart *newOne);
void slotLoadingProgress( int percent );
void slotSpeedProgress( int bytesPerSecond );
- void slotDisplayStatusText(const TQString& text);
+ void slotDisplaytqStatusText(const TQString& text);
void slotClear();
void message ( const TQString & message );
@@ -141,7 +141,7 @@ class KonqFrameStatusBar : public KStatusBar
KonqFrame* m_pParentKonqFrame;
TQCheckBox *m_pLinkedViewCheckBox;
KProgress *m_progressBar;
- KSqueezedTextLabel *m_pStatusLabel;
+ KSqueezedTextLabel *m_ptqStatusLabel;
TQLabel* m_led;
TQString m_savedMessage;
};
@@ -190,10 +190,10 @@ protected:
* them on click at the statusbar.
*
* KonqFrame makes the difference between built-in views and remote ones.
- * We create a layout in it (with the KonqFrameStatusBar as top item in the layout)
- * For builtin views we have the view as direct child widget of the layout
+ * We create a tqlayout in it (with the KonqFrameStatusBar as top item in the tqlayout)
+ * For builtin views we have the view as direct child widget of the tqlayout
* For remote views we have an OPFrame, having the view attached, as child
- * widget of the layout
+ * widget of the tqlayout
*/
class KonqFrame : public TQWidget, public KonqFrameBase
@@ -218,12 +218,12 @@ public:
virtual bool eventFilter(TQObject*obj,TQEvent *ev);
/**
- * Inserts the part's widget and the statusbar into the layout
+ * Inserts the part's widget and the statusbar into the tqlayout
*/
void attachInternal();
/**
- * Inserts a widget at the top of the part's widget, in the layout
+ * Inserts a widget at the top of the part's widget, in the tqlayout
* (used for the find functionality)
*/
void insertTopWidget( TQWidget * widget );
@@ -257,7 +257,7 @@ public:
virtual TQWidget* widget() { return this; }
virtual TQCString frameType() { return TQCString("View"); }
- TQVBoxLayout *layout()const { return m_pLayout; }
+ TQVBoxLayout *tqlayout()const { return m_pLayout; }
KonqFrameStatusBar *statusbar() const { return m_pStatusBar; }
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc
index 316c8825..196a046c 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cc
@@ -230,7 +230,7 @@ TQPtrList<KAction> ToggleViewGUIClient::actions() const
void ToggleViewGUIClient::slotToggleView( bool toggle )
{
- TQString serviceName = TQString::fromLatin1( sender()->name() );
+ TQString serviceName = TQString::tqfromLatin1( 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 */);
@@ -299,13 +299,13 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
void ToggleViewGUIClient::saveConfig( bool add, const TQString &serviceName )
{
// This is used on konqueror's startup....... so it's never used, since
- // the K menu only contains calls to kfmclient......
+ // the K menu only tqcontains calls to kfmclient......
// Well, it could be useful again in the future.
// Currently, the profiles save this info.
TQStringList toggableViewsShown = KonqSettings::toggableViewsShown();
if (add)
{
- if ( !toggableViewsShown.contains( serviceName ) )
+ if ( !toggableViewsShown.tqcontains( serviceName ) )
toggableViewsShown.append(serviceName);
}
else
diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc
index 3f3e47bc..17888e8c 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;
@@ -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_mainwindow.cc b/konqueror/konq_mainwindow.cc
index ada6c2ef..49a3e925 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -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 );
@@ -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 )
{
@@ -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 <corwin@micom.don.ru> !!!
// 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 {
@@ -966,10 +966,10 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs
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 )
{
@@ -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 );
}
@@ -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!)
@@ -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,11 +1816,11 @@ 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()->findProperty("modified") != -1) ) {
TQVariant prop = reloadView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
- i18n("This page contains changes that have not been submitted.\nReloading the page will discard these changes."),
+ i18n("This page tqcontains changes that have not been submitted.\nReloading the page will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"reload"), "discardchangesreload") != KMessageBox::Continue )
return;
}
@@ -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()->findProperty( "supportsUndo" ) != -1 )
{
TQVariant prop = m_currentView->part()->property( "supportsUndo" );
if ( prop.isValid() && prop.toBool() )
@@ -2069,7 +2069,7 @@ void KonqMainWindow::slotPartChanged( KonqView *childView, KParts::ReadOnlyPart
// Remove the old part, and add the new part to the manager
// Note: this makes the new part active... so it calls slotPartActivated
- m_pViewManager->replacePart( oldPart, newPart, false );
+ m_pViewManager->tqreplacePart( oldPart, newPart, false );
// Set active immediately
m_pViewManager->setActivePart( newPart, true );
@@ -2309,10 +2309,10 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part )
m_pMenuNew->setEnabled( m_currentView->supportsServiceType( "inode/directory" ) );
- m_currentView->frame()->statusbar()->updateActiveStatus();
+ m_currentView->frame()->statusbar()->updateActivetqStatus();
if ( oldView && oldView->frame() )
- oldView->frame()->statusbar()->updateActiveStatus();
+ oldView->frame()->statusbar()->updateActivetqStatus();
//kdDebug(1202) << "KonqMainWindow::slotPartActivated: setting location bar url to "
// << m_currentView->locationBarURL() << " m_currentView=" << m_currentView << endl;
@@ -2439,7 +2439,7 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const T
KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
if ( ext )
{
- ext = ext->findFrameParent(callingPart, name);
+ ext = ext->tqfindFrameParent(callingPart, name);
kdDebug() << "BrowserHostExtension found part " << ext << endl;
if (!ext)
continue; // Don't use this window
@@ -2666,11 +2666,11 @@ void KonqMainWindow::slotDuplicateTabPopup()
void KonqMainWindow::slotBreakOffTab()
{
if (m_currentView && m_currentView->part() &&
- (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) {
+ (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) {
TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
- i18n("This tab contains changes that have not been submitted.\nDetaching the tab will discard these changes."),
+ i18n("This tab tqcontains changes that have not been submitted.\nDetaching the tab will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"tab_breakoff"), "discardchangesdetach") != KMessageBox::Continue )
return;
}
@@ -2683,12 +2683,12 @@ 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()->findProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
if ( KMessageBox::warningContinueCancel( this,
- i18n("This tab contains changes that have not been submitted.\nDetaching the tab will discard these changes."),
+ i18n("This tab tqcontains changes that have not been submitted.\nDetaching the tab will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"tab_breakoff"), "discardchangesdetach") != KMessageBox::Continue )
{
m_pViewManager->showTab( originalView );
@@ -2788,11 +2788,11 @@ 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()->findProperty("modified") != -1) ) {
TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
- i18n("This view contains changes that have not been submitted.\nClosing the view will discard these changes."),
+ i18n("This view tqcontains changes that have not been submitted.\nClosing the view will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"view_remove"), "discardchangesclose") != KMessageBox::Continue )
return;
}
@@ -2804,11 +2804,11 @@ void KonqMainWindow::slotRemoveView()
void KonqMainWindow::slotRemoveTab()
{
if (m_currentView && m_currentView->part() &&
- (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) {
+ (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) {
TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
- i18n("This tab contains changes that have not been submitted.\nClosing the tab will discard these changes."),
+ i18n("This tab tqcontains changes that have not been submitted.\nClosing the tab will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"tab_remove"), "discardchangesclose") != KMessageBox::Continue )
return;
}
@@ -2820,12 +2820,12 @@ 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()->findProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
if ( KMessageBox::warningContinueCancel( this,
- i18n("This tab contains changes that have not been submitted.\nClosing the tab will discard these changes."),
+ i18n("This tab tqcontains changes that have not been submitted.\nClosing the tab will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"tab_remove"), "discardchangesclose") != KMessageBox::Continue )
{
m_pViewManager->showTab( originalView );
@@ -2857,12 +2857,12 @@ 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()->findProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
if ( KMessageBox::warningContinueCancel( this,
- i18n("This tab contains changes that have not been submitted.\nClosing other tabs will discard these changes."),
+ i18n("This tab tqcontains changes that have not been submitted.\nClosing other tabs will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"tab_remove"), "discardchangescloseother") != KMessageBox::Continue )
{
m_pViewManager->showTab( originalView );
@@ -2890,12 +2890,12 @@ 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()->findProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
if ( KMessageBox::warningContinueCancel( this,
- i18n("This tab contains changes that have not been submitted.\nReloading all tabs will discard these changes."),
+ i18n("This tab tqcontains changes that have not been submitted.\nReloading all tabs will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"reload"), "discardchangesreload") != KMessageBox::Continue )
{
m_pViewManager->showTab( originalView );
@@ -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,13 +3481,13 @@ 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 ) ) );
@@ -3522,13 +3522,13 @@ 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 ) ) );
@@ -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() );
@@ -4328,7 +4328,7 @@ 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 )
{
@@ -4337,7 +4337,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext )
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() );
//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 );
@@ -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
@@ -4678,7 +4678,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
// This action collection is used to pass actions to KonqPopupMenu.
// It has to be a KActionCollection instead of a KActionPtrList because we need
- // the actionStatusText signal...
+ // the actiontqStatusText signal...
KActionCollection popupMenuCollection( (TQWidget*)0 );
popupMenuCollection.insert( m_paBack );
popupMenuCollection.insert( m_paForward );
@@ -4840,7 +4840,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
delete pPopupMenu;
- // We're sort of misusing KActionCollection here, but we need it for the actionStatusText signal...
+ // We're sort of misusing KActionCollection here, but we need it for the actiontqStatusText signal...
// Anyway. If the action belonged to the view, and the view got deleted, we don't want ~KActionCollection
// to iterate over those deleted actions
KActionPtrList lst = popupMenuCollection.actions();
@@ -4889,7 +4889,7 @@ 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();
+ TQWidget* fw = tqfocusWidget();
if ( !fw || !::qt_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;
@@ -4984,7 +4984,7 @@ void KonqMainWindow::setInitialFrameName( const TQString &name )
m_initialFrameName = name;
}
-void KonqMainWindow::slotActionStatusText( const TQString &text )
+void KonqMainWindow::slotActiontqStatusText( const TQString &text )
{
if ( !m_currentView )
return;
@@ -4997,7 +4997,7 @@ void KonqMainWindow::slotActionStatusText( const TQString &text )
statusBar->message( text );
}
-void KonqMainWindow::slotClearStatusText()
+void KonqMainWindow::slotCleartqStatusText()
{
if ( !m_currentView )
return;
@@ -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();
@@ -5112,7 +5112,7 @@ 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() );
else
@@ -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;
@@ -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,12 +5321,12 @@ 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()->findProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
if ( KMessageBox::warningContinueCancel( this,
- i18n("This tab contains changes that have not been submitted.\nClosing the window will discard these changes."),
+ i18n("This tab tqcontains changes that have not been submitted.\nClosing the window will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"exit"), "discardchangesclose") != KMessageBox::Continue )
{
e->ignore();
@@ -5339,12 +5339,12 @@ 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()->findProperty("modified") != -1) )
{
TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
- i18n("This page contains changes that have not been submitted.\nClosing the window will discard these changes."),
+ i18n("This page tqcontains changes that have not been submitted.\nClosing the window will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"exit"), "discardchangesclose") != KMessageBox::Continue )
{
e->ignore();
@@ -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();
@@ -5500,18 +5500,18 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group )
void KonqMainWindow::connectActionCollection( KActionCollection *coll )
{
- connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
- this, TQT_SLOT( slotActionStatusText( const TQString & ) ) );
- connect( coll, TQT_SIGNAL( clearStatusText() ),
- this, TQT_SLOT( slotClearStatusText() ) );
+ connect( coll, TQT_SIGNAL( actiontqStatusText( const TQString & ) ),
+ this, TQT_SLOT( slotActiontqStatusText( const TQString & ) ) );
+ connect( coll, TQT_SIGNAL( cleartqStatusText() ),
+ this, TQT_SLOT( slotCleartqStatusText() ) );
}
void KonqMainWindow::disconnectActionCollection( KActionCollection *coll )
{
- disconnect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
- this, TQT_SLOT( slotActionStatusText( const TQString & ) ) );
- disconnect( coll, TQT_SIGNAL( clearStatusText() ),
- this, TQT_SLOT( slotClearStatusText() ) );
+ disconnect( coll, TQT_SIGNAL( actiontqStatusText( const TQString & ) ),
+ this, TQT_SLOT( slotActiontqStatusText( const TQString & ) ) );
+ disconnect( coll, TQT_SIGNAL( cleartqStatusText() ),
+ this, TQT_SLOT( slotCleartqStatusText() ) );
}
//
@@ -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())
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index 9ee5b7e1..a36ed573 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -505,8 +505,8 @@ protected slots:
void slotOpenURL( const KURL& );
- void slotActionStatusText( const TQString &text );
- void slotClearStatusText();
+ void slotActiontqStatusText( const TQString &text );
+ void slotCleartqStatusText();
void slotFindOpen( KonqDirPart * dirPart );
void slotFindClosed( KonqDirPart * dirPart );
diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc
index 66aeaba4..49d93408 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 );
@@ -225,7 +225,7 @@ KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text
, m_mw(mw)
{
setBackgroundMode( Qt::PaletteButton );
- setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
+ tqsetAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
Qt::AlignVCenter | Qt::ShowPrefix );
setAcceptDrops(true);
adjustSize();
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 2a354706..eca415ba 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()
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index 3cc5cc60..2311e763 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -62,7 +62,7 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon
{
KAcceleratorManager::setNoAccel(this);
- TQWhatsThis::add( tabBar(), i18n( "This bar contains the list of currently open tabs. Click on a tab to make it "
+ TQWhatsThis::add( tabBar(), i18n( "This bar tqcontains the list of currently open tabs. Click on a tab to make it "
"active. The option to show a close button instead of the website icon in the left "
"corner of the tab is configurable. You can also use keyboard shortcuts to "
"navigate through tabs. The text on the tab is the title of the website "
@@ -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() );
}
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index b27779a4..315b071b 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -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,7 +1077,7 @@ 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()->findSlot( methodName );
if ( id == -1 )
return false;
QUObject o[ 1 ];
@@ -1092,7 +1092,7 @@ 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()->findSlot( methodName );
if ( id == -1 )
return false;
QUObject o[ 2 ];
@@ -1109,7 +1109,7 @@ 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()->findSlot( methodName );
if ( id == -1 )
return false;
QUObject o[ 2 ];
@@ -1126,7 +1126,7 @@ 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()->findSlot( methodName );
if ( id == -1 )
return false;
QUObject o[ 2 ];
@@ -1268,7 +1268,7 @@ 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 )
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 28f2568d..9c4e9c5a 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -58,7 +58,7 @@ struct HistoryEntry
};
/* This class represents a child of the main view. The main view maintains
- * the list of children. A KonqView contains a Browser::View and
+ * the list of children. A KonqView tqcontains a Browser::View and
* handles it. It's more or less the backend structure for the views.
* The widget handling stuff is done by the KonqFrame.
*/
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index c4f03da7..cc0a3057 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,12 +1156,12 @@ 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()->findProperty("modified") != -1)) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
showTab( view );
if ( KMessageBox::warningContinueCancel( 0,
- i18n("This tab contains changes that have not been submitted.\nLoading a profile will discard these changes."),
+ i18n("This tab tqcontains changes that have not been submitted.\nLoading a profile will discard these changes."),
i18n("Discard Changes?"), i18n("&Discard Changes"), "discardchangesloadprofile") != KMessageBox::Continue )
{
showTab( originalView );
@@ -1175,11 +1175,11 @@ 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()->findProperty("modified") != -1)) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( 0,
- i18n("This page contains changes that have not been submitted.\nLoading a profile will discard these changes."),
+ i18n("This page tqcontains changes that have not been submitted.\nLoading a profile will discard these changes."),
i18n("Discard Changes?"), i18n("&Discard Changes"), "discardchangesloadprofile") != KMessageBox::Continue )
return;
}
@@ -1387,7 +1387,7 @@ void KonqViewManager::slotActivePartChanged ( KParts::Part *newPart )
}
if (view->frame()->parentContainer() == 0L) return;
if (!m_bLoadingProfile) {
- view->frame()->statusbar()->updateActiveStatus();
+ view->frame()->statusbar()->updateActivetqStatus();
view->frame()->parentContainer()->setActiveChild( view->frame() );
}
//kdDebug(1202) << "KonqViewManager::slotActivePartChanged done" << endl;
@@ -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 );
@@ -1803,7 +1803,7 @@ void KonqViewManager::printSizeInfo( KonqFrameBase* frame,
const char* msg )
{
TQRect r;
- r = frame->widget()->geometry();
+ r = frame->widget()->tqgeometry();
qDebug("Child size %s : x: %d, y: %d, w: %d, h: %d", msg, r.x(),r.y(),r.width(),r.height() );
if ( parent->frameType() == "Container" )
diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h
index 0e1a7f3d..a0977353 100644
--- a/konqueror/konq_viewmgr.h
+++ b/konqueror/konq_viewmgr.h
@@ -172,7 +172,7 @@ public:
void updatePixmaps();
/**
- * Saves the current view layout to a config file.
+ * Saves the current view tqlayout to a config file.
* Remove config file before saving, especially if saveURLs is false.
* @param cfg the config file
* @param saveURLs whether to save the URLs in the profile
@@ -181,7 +181,7 @@ public:
void saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWindowSize );
/**
- * Saves the current view layout to a config file.
+ * Saves the current view tqlayout to a config file.
* Remove config file before saving, especially if saveURLs is false.
* @param fileName the name of the config file
* @param profileName the name of the profile
@@ -192,7 +192,7 @@ public:
bool saveURLs, bool saveWindowSize );
/**
- * Loads a view layout from a config file. Removes all views before loading.
+ * Loads a view tqlayout from a config file. Removes all views before loading.
* @param cfg the config file
* @param filename if set, remember the file name of the profile (for save settings)
* It has to be under the profiles dir. Otherwise, set to TQString::null
@@ -207,7 +207,7 @@ public:
bool resetWindow = false, bool openURL = true );
/**
- * Loads a view layout from a config file. Removes all views before loading.
+ * Loads a view tqlayout from a config file. Removes all views before loading.
* @param path the full path to the config file
* @param filename if set, remember the file name of the profile (for save settings)
* It has to be under the profiles dir. Otherwise, set to TQString::null
diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg
index a412347d..8f1a56e8 100644
--- a/konqueror/konqueror.kcfg
+++ b/konqueror/konqueror.kcfg
@@ -479,7 +479,7 @@ PATH_JAVA
<label></label>
<whatsthis></whatsthis>
</entry>
- <entry key="WindowStatusPolicy" type="UInt"> <!--KHTML-->
+ <entry key="WindowtqStatusPolicy" type="UInt"> <!--KHTML-->
<label></label>
<whatsthis></whatsthis>
</entry>
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index 7b06a499..ad8c46dd 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 );
@@ -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 e8192811..2ba7b806 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 783c6eef..753699bc 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -32,8 +32,8 @@
#include <tqstringlist.h>
KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent,
- TQWidget* parentWidget)
- : KonqBaseListViewWidget(parent, parentWidget)
+ TQWidget* tqparentWidget)
+ : KonqBaseListViewWidget(parent, tqparentWidget)
{
m_metaInfoJob = 0;
diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h
index 5ae497ac..46bda8b2 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 f256e8e3..461e97b2 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;
}
@@ -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 8665160d..0fc8f034 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 3c70f1fb..2485a4ae 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -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
@@ -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 );
@@ -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 b54f1c2d..8e78b10f 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 8f166af0..115e762e 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;
@@ -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;
@@ -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() ) );
@@ -553,7 +553,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p )
pt = contentsToViewport( pt );
style().drawPrimitive( 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 )
@@ -985,7 +985,7 @@ 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;
@@ -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();
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index d6123c11..7d57c202 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 8e03e171..0d40ecfc 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 f091781e..02a53468 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 32de2535..ded829d6 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;
diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h
index 06a5cbbb..5596e4d2 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 4d04f2fa..07adda9e 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;
@@ -163,7 +163,7 @@ void KonqTreeViewWidget::slotClear( const KURL & _url )
}
// Remark: This code works only if we have exactly one tree which is the
- // case for Konqy's treeview. It will break if m_dictSubDirs contains two
+ // case for Konqy's treeview. It will break if m_dictSubDirs tqcontains two
// subdirectories where only one of them will have its items deleted by
// the following code.
diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h
index 3f08cc3d..8ced17e6 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 23c1704d..020d7dc6 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 7d84071f..026ed08b 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,
diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp
index eefa5733..e41d1c99 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/sidebar/Makefile.am b/konqueror/sidebar/Makefile.am
index 70232084..4e71f9db 100644
--- a/konqueror/sidebar/Makefile.am
+++ b/konqueror/sidebar/Makefile.am
@@ -13,7 +13,7 @@ noinst_HEADERS = konqsidebar.h sidebar_widget.h konqsidebariface_p.h
include_HEADERS = konqsidebarplugin.h
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
METASOURCES = AUTO
lib_LTLIBRARIES = libkonqsidebarplugin.la
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index bdc99a4c..3e701311 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,7 +30,7 @@ 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*)));
@@ -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 ec63e6d0..2724b2d3 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.h b/konqueror/sidebar/konqsidebarplugin.h
index d3ecf7ce..8844d302 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -66,7 +66,7 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject
void openPreviewOnMouseOver(const KFileItem& item); // not used yet, perhaps KDE 3.1
/*
- if your plugin supports a setup dialog, instead (replaces the url menu entry in the popup) (not supported yet)
+ if your plugin supports a setup dialog, instead (tqreplaces the url menu entry in the popup) (not supported yet)
void setup(TQWidget *parent);
*/
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index b4940e8e..44429de7 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -234,7 +234,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
m_somethingVisible = false;
m_initial = true;
m_noUpdate = false;
- m_layout = 0;
+ m_tqlayout = 0;
m_currentButton = 0;
m_activeModule = 0;
m_userMovedSplitter = false;
@@ -251,7 +251,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 +261,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);
@@ -387,21 +387,21 @@ void Sidebar_Widget::saveConfig()
void Sidebar_Widget::doLayout()
{
- if (m_layout)
- delete m_layout;
+ if (m_tqlayout)
+ delete m_tqlayout;
- m_layout = new TQHBoxLayout(this);
+ m_tqlayout = new TQHBoxLayout(this);
if (m_showTabsLeft)
{
- m_layout->add(m_buttonBar);
- m_layout->add(m_area);
+ m_tqlayout->add(m_buttonBar);
+ m_tqlayout->add(m_area);
m_buttonBar->setPosition(KMultiTabBar::Left);
} else {
- m_layout->add(m_area);
- m_layout->add(m_buttonBar);
+ m_tqlayout->add(m_area);
+ m_tqlayout->add(m_buttonBar);
m_buttonBar->setPosition(KMultiTabBar::Right);
}
- m_layout->activate();
+ m_tqlayout->activate();
if (m_hideTabs) m_buttonBar->hide();
else m_buttonBar->show();
}
@@ -460,10 +460,10 @@ void Sidebar_Widget::initialCopy()
TQStringList::ConstIterator eEnd = globalDirEntries.end();
for (; eIt != eEnd; ++eIt )
{
- //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
+ //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir tqcontains " << *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,7 +674,7 @@ 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()->findSlot( handlestd );
if ( id == -1 )
return;
kdDebug() << "Action slot was found, it will be called now" << endl;
@@ -742,7 +742,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;
@@ -1042,28 +1042,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)
@@ -1194,50 +1194,50 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
void Sidebar_Widget::connectModule(TQObject *mod)
{
- if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) {
+ if (mod->tqmetaObject()->findSignal("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()->findSignal("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()->findSignal("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()->findSignal("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()->findSignal("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()->findSignal("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()->findSignal("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()->findSignal("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()->findSignal("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 &)));
}
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index c99ae388..183a88bf 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -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);
@@ -185,7 +185,7 @@ private:
KMultiTabBar *m_buttonBar;
TQPtrVector<ButtonInfo> m_buttons;
- TQHBoxLayout *m_layout;
+ TQHBoxLayout *m_tqlayout;
KPopupMenu *m_buttonPopup;
TQPopupMenu *m_menu;
TQGuardedPtr<ButtonInfo> m_activeModule;
diff --git a/konqueror/sidebar/test/Makefile.am b/konqueror/sidebar/test/Makefile.am
index ebaeff29..962b43ff 100644
--- a/konqueror/sidebar/test/Makefile.am
+++ b/konqueror/sidebar/test/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = -I$(srcdir)/.. $(all_includes)
# these are the headers for your project
noinst_HEADERS = konqsidebartest.h
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
METASOURCES = AUTO
kde_module_LTLIBRARIES = konq_sidebartest.la
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index d00605c8..2c7ae8a4 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -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();
@@ -443,7 +443,7 @@ void KonqSidebarBookmarkModule::slotBookmarksChanged( const TQString & groupAddr
m_ignoreOpenChange = true;
// update the right part of the tree
- KBookmarkGroup group = KonqBookmarkManager::self()->findByAddress( groupAddress ).toGroup();
+ KBookmarkGroup group = KonqBookmarkManager::self()->tqfindByAddress( groupAddress ).toGroup();
KonqSidebarBookmarkItem * item = findByAddress( groupAddress );
Q_ASSERT(!group.isNull());
Q_ASSERT(item);
@@ -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 811867b1..58c1c86c 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;
}
@@ -163,7 +163,7 @@ void KonqSidebarDirTreeItem::itemSelected()
bInTrash = true;
TQMimeSource *data = TQApplication::clipboard()->data();
- bool paste = ( data->encodedData( data->format() ).size() != 0 );
+ bool paste = ( data->tqencodedData( data->format() ).size() != 0 );
tree()->enableActions( true, true, paste, true && !bInTrash, true, true );
}
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
index 050f1942..3a599c7e 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 ac26b128..401c4985 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 32fd3129..efffe598 100644
--- a/konqueror/sidebar/trees/history_module/history_dlg.ui
+++ b/konqueror/sidebar/trees/history_module/history_dlg.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>KonqHistoryDlg</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>240</width>
<height>16</height>
@@ -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>
@@ -224,8 +224,8 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<layoutdefaults spacing="6" margin="0"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 981be03b..844f963a 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -126,10 +126,10 @@ 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 );
@@ -149,7 +149,7 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
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 1c6c7c4c..0ddc7ae4 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 a3806be9..a29a2fe0 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.
@@ -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 );
}
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 6871415a..20ca214d 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 ccedf65d..532e3a16 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/init/home.desktop b/konqueror/sidebar/trees/init/home.desktop
index d18f9846..d91617b9 100644
--- a/konqueror/sidebar/trees/init/home.desktop
+++ b/konqueror/sidebar/trees/init/home.desktop
@@ -76,7 +76,7 @@ Name[vi]=Thư mục Nhà
Name[wa]=Ridant måjhon
Name[zh_CN]=主文件夹
Name[zh_TW]=家目錄
-Comment=This folder contains your personal files
+Comment=This folder tqcontains your personal files
Comment[af]=Hierdie kabinet bevat jou persoonlike lêers
Comment[ar]=هذا المجلّد يحتوي على ملفاتك الخاصة
Comment[az]=Bütün şəxsi fayllarınız bu qovluqda yer alır
diff --git a/konqueror/sidebar/trees/init/system.desktop b/konqueror/sidebar/trees/init/system.desktop
index 490b4ef7..9a43fe03 100644
--- a/konqueror/sidebar/trees/init/system.desktop
+++ b/konqueror/sidebar/trees/init/system.desktop
@@ -111,11 +111,11 @@ Comment[kk]=Бұл қапшық компьютердегі ортақ орынд
Comment[km]=ថត​នេះ​អនុញ្ញាត​ឲ្យអ្នក​ចូលដំណើរការ​កន្លែង​ទូទៅ​លើកុំព្យូទ័រ​របស់​អ្នក
Comment[lt]=Šio aplanko padedami pasieksite dažniausiai lankomas kompiuterio vietas
Comment[mk]=Оваа папка ви овозможува пристап до вообичаените места на вашиот компјутер
-Comment[nb]=Denne mappa gir deg tilgang til vanlige steder på din datamaskin
+Comment[nb]=Denne mappa gir deg tilgang til vanlige steder på din datatqmaskin
Comment[nds]=Mit dissen Orner kannst Du op en Reeg faken bruukte Öörd togriepen
Comment[ne]=यो फोल्डरले तपाईँलाई कम्प्युटरको साझा स्थानहरूमा पहुँच अनुमति दिन्छ
Comment[nl]=Deze map geeft toegang tot algemene plekken van uw desktop
-Comment[nn]=Denne mappa gir deg tilgang til nokre vanlege stader på datamaskina
+Comment[nn]=Denne mappa gir deg tilgang til nokre vanlege stader på datatqmaskina
Comment[pa]=ਇਹ ਫੋਲਡਰ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ 'ਚ ਆਮ ਥਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ
Comment[pl]=Ten folder umożliwia dostęp do najczęściej używanych miejsc w Twoim komputerze
Comment[pt]=Esta pasta permite aceder a alguns locais comuns no seu computador
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index c1c98e07..0ce8f9d5 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;
}
@@ -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;
@@ -650,9 +650,9 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
TQStringList::ConstIterator eEnd = globalDirEntries.end();
for (; eIt != eEnd; ++eIt )
{
- //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
+ //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir tqcontains " << *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++;
@@ -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;
@@ -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() );
}
@@ -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 269803a8..8cfb2106 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -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_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 4ce6fe44..d526a826 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -57,7 +57,7 @@ void KonqSidebarTreeTopLevelItem::itemSelected()
bool KonqSidebarTreeTopLevelItem::acceptsDrops( const TQStrList & formats )
{
- return formats.contains("text/uri-list") &&
+ return formats.tqcontains("text/uri-list") &&
( m_bTopLevelGroup || !externalURL().isEmpty() );
}