summaryrefslogtreecommitdiffstats
path: root/konqueror
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror')
-rw-r--r--konqueror/KonquerorIface.cc16
-rw-r--r--konqueror/about/konq_aboutpage.cc346
-rw-r--r--konqueror/about/specs.html2
-rw-r--r--konqueror/client/kfmclient.cc56
-rw-r--r--konqueror/iconview/konq_iconview.cc32
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp6
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.cpp4
-rw-r--r--konqueror/keditbookmarks/commands.cpp6
-rw-r--r--konqueror/keditbookmarks/dcop.cpp2
-rw-r--r--konqueror/keditbookmarks/listview.cpp12
-rw-r--r--konqueror/keditbookmarks/listview.h6
-rw-r--r--konqueror/keditbookmarks/main.cpp4
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp16
-rw-r--r--konqueror/konq_actions.cc18
-rw-r--r--konqueror/konq_actions.h2
-rw-r--r--konqueror/konq_combo.cc40
-rw-r--r--konqueror/konq_extensionmanager.cc2
-rw-r--r--konqueror/konq_factory.cc2
-rw-r--r--konqueror/konq_frame.cc64
-rw-r--r--konqueror/konq_guiclients.cc6
-rw-r--r--konqueror/konq_main.cc6
-rw-r--r--konqueror/konq_mainwindow.cc80
-rw-r--r--konqueror/konq_misc.cc4
-rw-r--r--konqueror/konq_profiledlg.cc4
-rw-r--r--konqueror/konq_tabs.cc24
-rw-r--r--konqueror/konq_view.cc52
-rw-r--r--konqueror/konq_view.h8
-rw-r--r--konqueror/konq_viewmgr.cc70
-rw-r--r--konqueror/kttsplugin/khtmlkttsd.cpp4
-rw-r--r--konqueror/listview/konq_infolistviewitem.cc4
-rw-r--r--konqueror/listview/konq_infolistviewitem.h2
-rw-r--r--konqueror/listview/konq_infolistviewwidget.cc8
-rw-r--r--konqueror/listview/konq_listview.cc6
-rw-r--r--konqueror/listview/konq_listviewitems.cc12
-rw-r--r--konqueror/listview/konq_listviewitems.h2
-rw-r--r--konqueror/listview/konq_listviewwidget.cc42
-rw-r--r--konqueror/listview/konq_listviewwidget.h2
-rw-r--r--konqueror/listview/konq_textviewitem.cc4
-rw-r--r--konqueror/listview/konq_textviewitem.h2
-rw-r--r--konqueror/listview/konq_textviewwidget.cc8
-rw-r--r--konqueror/listview/konq_treeviewwidget.cc8
-rw-r--r--konqueror/preloader/preloader.cc4
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.cpp2
-rw-r--r--konqueror/shellcmdplugin/kshellcmddialog.cpp10
-rw-r--r--konqueror/shellcmdplugin/kshellcmdexecutor.h2
-rw-r--r--konqueror/sidebar/konqsidebar.cpp2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp62
-rw-r--r--konqueror/sidebar/sidebar_widget.h2
-rw-r--r--konqueror/sidebar/test/konqsidebartest.h2
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp10
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp12
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.h2
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp4
-rw-r--r--konqueror/sidebar/trees/history_module/history_dlg.ui6
-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.cpp6
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.cpp8
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp18
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp6
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.cpp8
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.h2
63 files changed, 586 insertions, 586 deletions
diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc
index ce945d832..2f87bae8e 100644
--- a/konqueror/KonquerorIface.cc
+++ b/konqueror/KonquerorIface.cc
@@ -251,18 +251,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;
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index 7869eb30c..03dfad93b 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -1,6 +1,6 @@
#include "konq_aboutpage.h"
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <kaboutdata.h>
#include <kapplication.h>
@@ -77,9 +77,9 @@ 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);
@@ -110,11 +110,11 @@ TQString KonqAboutPageFactory::launch()
TQString home_folder = TQDir::homeDirPath();
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
- res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
+ res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
- res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
+ res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
else
- res = res.arg( "" );
+ res = res.tqarg( "" );
// Try to split page in three. If it succeeds, insert the default search into the middle part.
TQStringList parts = TQStringList::split( "<!--search bar splitter-->", res );
@@ -123,56 +123,56 @@ TQString KonqAboutPageFactory::launch()
config.setGroup( "General" );
TQString name = config.readEntry("DefaultSearchEngine");
KService::Ptr service =
- KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(name));
+ KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(name));
if ( service ) {
TQString searchBar = parts[1];
searchBar = searchBar
- .arg( iconSize ).arg( iconSize )
- .arg( service->name() )
- .arg( service->property("Keys").toStringList()[0] )
+ .tqarg( iconSize ).tqarg( iconSize )
+ .tqarg( service->name() )
+ .tqarg( service->property("Keys").toStringList()[0] )
;
res = parts[0] + searchBar + parts[2];
}
else res = parts[0] + parts[2];
}
- res = res.arg( i18n("Conquer your Desktop!") )
- .arg( i18n( "Konqueror" ) )
- .arg( i18n("Conquer your Desktop!") )
- .arg( i18n("Konqueror is your file manager, web browser and universal document viewer.") )
- .arg( i18n( "Starting Points" ) )
- .arg( i18n( "Introduction" ) )
- .arg( i18n( "Tips" ) )
- .arg( i18n( "Specifications" ) )
- .arg( home_folder )
- .arg( home_icon_path )
- .arg(iconSize).arg(iconSize)
- .arg( home_folder )
- .arg( i18n( "Home Folder" ) )
- .arg( i18n( "Your personal files" ) )
- .arg( storage_icon_path )
- .arg(iconSize).arg(iconSize)
- .arg( i18n( "Storage Media" ) )
- .arg( i18n( "Disks and removable media" ) )
- .arg( remote_icon_path )
- .arg(iconSize).arg(iconSize)
- .arg( i18n( "Network Folders" ) )
- .arg( i18n( "Shared files and folders" ) )
- .arg( wastebin_icon_path )
- .arg(iconSize).arg(iconSize)
- .arg( i18n( "Trash" ) )
- .arg( i18n( "Browse and restore the trash" ) )
- .arg( applications_icon_path )
- .arg(iconSize).arg(iconSize)
- .arg( i18n( "Applications" ) )
- .arg( i18n( "Installed programs" ) )
- .arg( help_icon_path )
- .arg(iconSize).arg(iconSize)
- .arg( i18n( "About Kubuntu" ) )
- .arg( i18n( "<a href=\"help:/kubuntu/\">Kubuntu Documentation</a>" ) )
- .arg( continue_icon_path )
- .arg( KIcon::SizeSmall ).arg( KIcon::SizeSmall )
- .arg( i18n( "Next: An Introduction to Konqueror" ) )
+ res = res.tqarg( i18n("Conquer your Desktop!") )
+ .tqarg( i18n( "Konqueror" ) )
+ .tqarg( i18n("Conquer your Desktop!") )
+ .tqarg( i18n("Konqueror is your file manager, web browser and universal document viewer.") )
+ .tqarg( i18n( "Starting Points" ) )
+ .tqarg( i18n( "Introduction" ) )
+ .tqarg( i18n( "Tips" ) )
+ .tqarg( i18n( "Specifications" ) )
+ .tqarg( home_folder )
+ .tqarg( home_icon_path )
+ .tqarg(iconSize).tqarg(iconSize)
+ .tqarg( home_folder )
+ .tqarg( i18n( "Home Folder" ) )
+ .tqarg( i18n( "Your personal files" ) )
+ .tqarg( storage_icon_path )
+ .tqarg(iconSize).tqarg(iconSize)
+ .tqarg( i18n( "Storage Media" ) )
+ .tqarg( i18n( "Disks and removable media" ) )
+ .tqarg( remote_icon_path )
+ .tqarg(iconSize).tqarg(iconSize)
+ .tqarg( i18n( "Network Folders" ) )
+ .tqarg( i18n( "Shared files and folders" ) )
+ .tqarg( wastebin_icon_path )
+ .tqarg(iconSize).tqarg(iconSize)
+ .tqarg( i18n( "Trash" ) )
+ .tqarg( i18n( "Browse and restore the trash" ) )
+ .tqarg( applications_icon_path )
+ .tqarg(iconSize).tqarg(iconSize)
+ .tqarg( i18n( "Applications" ) )
+ .tqarg( i18n( "Installed programs" ) )
+ .tqarg( help_icon_path )
+ .tqarg(iconSize).tqarg(iconSize)
+ .tqarg( i18n( "About Kubuntu" ) )
+ .tqarg( i18n( "<a href=\"help:/kubuntu/\">Kubuntu Documentation</a>" ) )
+ .tqarg( continue_icon_path )
+ .tqarg( KIcon::SizeSmall ).tqarg( KIcon::SizeSmall )
+ .tqarg( i18n( "Next: An Introduction to Konqueror" ) )
;
i18n("Search the Web");//i18n for possible future use
@@ -195,42 +195,42 @@ TQString KonqAboutPageFactory::intro()
TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
- res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
+ res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
- res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
+ res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
else
- res = res.arg( "" );
-
- res = res.arg( i18n("Conquer your Desktop!") )
- .arg( i18n( "Konqueror" ) )
- .arg( i18n( "Conquer your Desktop!") )
- .arg( i18n( "Konqueror is your file manager, web browser and universal document viewer.") )
- .arg( i18n( "Starting Points" ) )
- .arg( i18n( "Introduction" ) )
- .arg( i18n( "Tips" ) )
- .arg( i18n( "Specifications" ) )
- .arg( i18n( "Konqueror makes working with and managing your files easy. You can browse "
+ res = res.tqarg( "" );
+
+ res = res.tqarg( i18n("Conquer your Desktop!") )
+ .tqarg( i18n( "Konqueror" ) )
+ .tqarg( i18n( "Conquer your Desktop!") )
+ .tqarg( i18n( "Konqueror is your file manager, web browser and universal document viewer.") )
+ .tqarg( i18n( "Starting Points" ) )
+ .tqarg( i18n( "Introduction" ) )
+ .tqarg( i18n( "Tips" ) )
+ .tqarg( i18n( "Specifications" ) )
+ .tqarg( i18n( "Konqueror makes working with and managing your files easy. You can browse "
"both local and networked folders while enjoying advanced features "
"such as the powerful sidebar and file previews."
) )
- .arg( i18n( "Konqueror is also a full featured and easy to use web browser which you "
+ .tqarg( i18n( "Konqueror is also a full featured and easy to use web browser which you "
"can use to explore the Internet. "
"Enter the address (e.g. <a href=\"http://www.kde.org\">http://www.kde.org</A>) "
"of a web page you would like to visit in the location bar and press Enter, "
"or choose an entry from the Bookmarks menu.") )
- .arg( i18n( "To return to the previous "
+ .tqarg( i18n( "To return to the previous "
"location, press the back button <img width='16' height='16' src=\"%1\"> "
- "in the toolbar. ").arg( back_icon_path ) )
- .arg( i18n( "To quickly go to your Home folder press the "
- " home button <img width='16' height='16' src=\"%1\">." ).arg(gohome_icon_path) )
- .arg( i18n( "For more detailed documentation on Konqueror click <a href=\"%1\">here</a>." )
- .arg("exec:/khelpcenter") )
- .arg( i18n( "<em>Tuning Tip:</em> If you want the Konqueror web browser to start faster,"
+ "in the toolbar. ").tqarg( back_icon_path ) )
+ .tqarg( i18n( "To quickly go to your Home folder press the "
+ " home button <img width='16' height='16' src=\"%1\">." ).tqarg(gohome_icon_path) )
+ .tqarg( i18n( "For more detailed documentation on Konqueror click <a href=\"%1\">here</a>." )
+ .tqarg("exec:/khelpcenter") )
+ .tqarg( i18n( "<em>Tuning Tip:</em> If you want the Konqueror web browser to start faster,"
" you can turn off this information screen by clicking <a href=\"%1\">here</a>. You can re-enable it"
" by choosing the Help -> Konqueror Introduction menu option, and then pressing "
- "Settings -> Save View Profile \"Web Browsing\".").arg("config:/disable_overview") )
- .arg( "<img width='16' height='16' src=\"%1\">" ).arg( continue_icon_path )
- .arg( i18n( "Next: Tips &amp; Tricks" ) )
+ "Settings -> Save View Profile \"Web Browsing\".").tqarg("config:/disable_overview") )
+ .tqarg( "<img width='16' height='16' src=\"%1\">" ).tqarg( continue_icon_path )
+ .tqarg( i18n( "Next: Tips &amp; Tricks" ) )
;
@@ -250,69 +250,69 @@ TQString KonqAboutPageFactory::specs()
if ( res.isEmpty() )
return res;
- res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
+ res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
- res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
+ res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
else
- res = res.arg( "" );
-
- res = res.arg( i18n("Conquer your Desktop!") )
- .arg( i18n( "Konqueror" ) )
- .arg( i18n("Conquer your Desktop!") )
- .arg( i18n("Konqueror is your file manager, web browser and universal document viewer.") )
- .arg( i18n( "Starting Points" ) )
- .arg( i18n( "Introduction" ) )
- .arg( i18n( "Tips" ) )
- .arg( i18n( "Specifications" ) )
- .arg( i18n("Specifications") )
- .arg( i18n("Konqueror is designed to embrace and support Internet standards. "
+ res = res.tqarg( "" );
+
+ res = res.tqarg( i18n("Conquer your Desktop!") )
+ .tqarg( i18n( "Konqueror" ) )
+ .tqarg( i18n("Conquer your Desktop!") )
+ .tqarg( i18n("Konqueror is your file manager, web browser and universal document viewer.") )
+ .tqarg( i18n( "Starting Points" ) )
+ .tqarg( i18n( "Introduction" ) )
+ .tqarg( i18n( "Tips" ) )
+ .tqarg( i18n( "Specifications" ) )
+ .tqarg( i18n("Specifications") )
+ .tqarg( i18n("Konqueror is designed to embrace and support Internet standards. "
"The aim is to fully implement the officially sanctioned standards "
"from organizations such as the W3 and OASIS, while also adding "
"extra support for other common usability features that arise as "
"de facto standards across the Internet. Along with this support, "
"for such functions as favicons, Internet Keywords, and <A HREF=\"%1\">XBEL bookmarks</A>, "
- "Konqueror also implements:").arg("http://pyxml.sourceforge.net/topics/xbel/") )
- .arg( i18n("Web Browsing") )
- .arg( i18n("Supported standards") )
- .arg( i18n("Additional requirements*") )
- .arg( i18n("<A HREF=\"%1\">DOM</A> (Level 1, partially Level 2) based "
- "<A HREF=\"%2\">HTML 4.01</A>").arg("http://www.w3.org/DOM").arg("http://www.w3.org/TR/html4/") )
- .arg( i18n("built-in") )
- .arg( i18n("<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)").arg("http://www.w3.org/Style/CSS/") )
- .arg( i18n("built-in") )
- .arg( i18n("<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)").arg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") )
- .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell khtml_java_js") )
- .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) // leave the double backslashes here, they are necessary for javascript !
- .arg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support").arg("http://java.sun.com") )
- .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> or <A HREF=\"%3\">Sun</A>)")
- .arg("http://www.blackdown.org").arg("http://www.ibm.com").arg("http://java.sun.com") )
- .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) // TODO Maybe test if Java is enabled ?
- .arg( i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)")
- .arg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash")
- .arg("http://www.real.com").arg("http://www.real.com")
- .arg("about:plugins") )
- .arg( i18n("built-in") )
- .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("built-in") )
- .arg( i18n("AutoCompletion for forms") )
- .arg( i18n("built-in") )
- .arg( i18n("G E N E R A L") )
- .arg( i18n("Feature") )
- .arg( i18n("Details") )
- .arg( i18n("Image formats") )
- .arg( i18n("Transfer protocols") )
- .arg( i18n("HTTP 1.1 (including gzip/bzip2 compression)") )
- .arg( i18n("FTP") )
- .arg( i18n("and <A HREF=\"%1\">many more...</A>").arg("exec:/kcmshell ioslaveinfo") )
- .arg( i18n("URL-Completion") )
- .arg( i18n("Manual"))
- .arg( i18n("Popup"))
- .arg( i18n("(Short-) Automatic"))
- .arg( "<img width='16' height='16' src=\"%1\">" ).arg( continue_icon_path )
- .arg( i18n("<a href=\"%1\">Return to Starting Points</a>").arg("launch.html") )
+ "Konqueror also implements:").tqarg("http://pyxml.sourceforge.net/topics/xbel/") )
+ .tqarg( i18n("Web Browsing") )
+ .tqarg( i18n("Supported standards") )
+ .tqarg( i18n("Additional requirements*") )
+ .tqarg( i18n("<A HREF=\"%1\">DOM</A> (Level 1, partially Level 2) based "
+ "<A HREF=\"%2\">HTML 4.01</A>").tqarg("http://www.w3.org/DOM").tqarg("http://www.w3.org/TR/html4/") )
+ .tqarg( i18n("built-in") )
+ .tqarg( i18n("<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)").tqarg("http://www.w3.org/Style/CSS/") )
+ .tqarg( i18n("built-in") )
+ .tqarg( i18n("<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)").tqarg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") )
+ .tqarg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").tqarg("exec:/kcmshell khtml_java_js") )
+ .tqarg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").tqarg("exec:/kcmshell khtml_java_js") ) // leave the double backslashes here, they are necessary for javascript !
+ .tqarg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support").tqarg("http://java.sun.com") )
+ .tqarg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> or <A HREF=\"%3\">Sun</A>)")
+ .tqarg("http://www.blackdown.org").tqarg("http://www.ibm.com").tqarg("http://java.sun.com") )
+ .tqarg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").tqarg("exec:/kcmshell khtml_java_js") ) // TODO Maybe test if Java is enabled ?
+ .tqarg( i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)")
+ .tqarg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash")
+ .tqarg("http://www.real.com").tqarg("http://www.real.com")
+ .tqarg("about:plugins") )
+ .tqarg( i18n("built-in") )
+ .tqarg( i18n("Secure Sockets Layer") )
+ .tqarg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") )
+ .tqarg( i18n("OpenSSL") )
+ .tqarg( i18n("Bidirectional 16bit tqunicode support") )
+ .tqarg( i18n("built-in") )
+ .tqarg( i18n("AutoCompletion for forms") )
+ .tqarg( i18n("built-in") )
+ .tqarg( i18n("G E N E R A L") )
+ .tqarg( i18n("Feature") )
+ .tqarg( i18n("Details") )
+ .tqarg( i18n("Image formats") )
+ .tqarg( i18n("Transfer protocols") )
+ .tqarg( i18n("HTTP 1.1 (including gzip/bzip2 compression)") )
+ .tqarg( i18n("FTP") )
+ .tqarg( i18n("and <A HREF=\"%1\">many more...</A>").tqarg("exec:/kcmshell ioslaveinfo") )
+ .tqarg( i18n("URL-Completion") )
+ .tqarg( i18n("Manual"))
+ .tqarg( i18n("Popup"))
+ .tqarg( i18n("(Short-) Automatic"))
+ .tqarg( "<img width='16' height='16' src=\"%1\">" ).tqarg( continue_icon_path )
+ .tqarg( i18n("<a href=\"%1\">Return to Starting Points</a>").tqarg("launch.html") )
;
@@ -347,57 +347,57 @@ TQString KonqAboutPageFactory::tips()
iconloader->iconPath("view_left_right", KIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
- res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
+ res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
- res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
+ res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
else
- res = res.arg( "" );
-
- res = res.arg( i18n("Conquer your Desktop!") )
- .arg( i18n( "Konqueror" ) )
- .arg( i18n("Conquer your Desktop!") )
- .arg( i18n("Konqueror is your file manager, web browser and universal document viewer.") )
- .arg( i18n( "Starting Points" ) )
- .arg( i18n( "Introduction" ) )
- .arg( i18n( "Tips" ) )
- .arg( i18n( "Specifications" ) )
- .arg( i18n( "Tips &amp; Tricks" ) )
- .arg( i18n( "Use Internet-Keywords and Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, "
+ res = res.tqarg( "" );
+
+ res = res.tqarg( i18n("Conquer your Desktop!") )
+ .tqarg( i18n( "Konqueror" ) )
+ .tqarg( i18n("Conquer your Desktop!") )
+ .tqarg( i18n("Konqueror is your file manager, web browser and universal document viewer.") )
+ .tqarg( i18n( "Starting Points" ) )
+ .tqarg( i18n( "Introduction" ) )
+ .tqarg( i18n( "Tips" ) )
+ .tqarg( i18n( "Specifications" ) )
+ .tqarg( i18n( "Tips &amp; Tricks" ) )
+ .tqarg( i18n( "Use Internet-Keywords and Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, "
"using Google, for the search phrase \"KDE\". There are a lot of "
"Web-Shortcuts predefined to make searching for software or looking "
"up certain words in an encyclopedia a breeze. You can even "
- "<a href=\"%1\">create your own</a> Web-Shortcuts." ).arg("exec:/kcmshell ebrowsing") )
- .arg( i18n( "Use the magnifier button <img width='16' height='16' src=\"%1\"> in the"
- " toolbar to increase the font size on your web page.").arg(viewmag_icon_path) )
- .arg( i18n( "When you want to paste a new address into the Location toolbar you might want to "
+ "<a href=\"%1\">create your own</a> Web-Shortcuts." ).tqarg("exec:/kcmshell ebrowsing") )
+ .tqarg( i18n( "Use the magnifier button <img width='16' height='16' src=\"%1\"> in the"
+ " toolbar to increase the font size on your web page.").tqarg(viewmag_icon_path) )
+ .tqarg( i18n( "When you want to paste a new address into the Location toolbar you might want to "
"clear the current entry by pressing the black arrow with the white cross "
"<img width='16' height='16' src=\"%1\"> in the toolbar.")
- .arg(TQApplication::reverseLayout() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path))
- .arg( i18n( "To create a link on your desktop pointing to the current page, "
+ .tqarg(TQApplication::reverseLayout() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path))
+ .tqarg( i18n( "To create a link on your desktop pointing to the current page, "
"simply drag the \"Location\" label that is to the left of the Location toolbar, drop it on to "
"the desktop, and choose \"Link\"." ) )
- .arg( i18n( "You can also find <img width='16' height='16' src=\"%1\"> \"Full-Screen Mode\" "
+ .tqarg( i18n( "You can also find <img width='16' height='16' src=\"%1\"> \"Full-Screen Mode\" "
"in the Settings menu. This feature is very useful for \"Talk\" "
- "sessions.").arg(window_fullscreen_icon_path) )
- .arg( i18n( "Divide et impera (lat. \"Divide and conquer\") - by splitting a window "
+ "sessions.").tqarg(window_fullscreen_icon_path) )
+ .tqarg( i18n( "Divide et impera (lat. \"Divide and conquer\") - by splitting a window "
"into two parts (e.g. Window -> <img width='16' height='16' src=\"%1\"> Split View "
"Left/Right) you can make Konqueror appear the way you like. You"
" can even load some example view-profiles (e.g. Midnight Commander)"
- ", or create your own ones." ).arg(view_left_right_icon_path))
- .arg( i18n( "Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting "
+ ", or create your own ones." ).tqarg(view_left_right_icon_path))
+ .tqarg( i18n( "Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting "
"asks you to use a different browser "
- "(and do not forget to send a complaint to the webmaster!)" ).arg("exec:/kcmshell useragent") )
- .arg( i18n( "The <img width='16' height='16' src=\"%1\"> History in your SideBar ensures "
- "that you can keep track of the pages you have visited recently.").arg(history_icon_path) )
- .arg( i18n( "Use a caching <a href=\"%1\">proxy</a> to speed up your"
- " Internet connection.").arg("exec:/kcmshell proxy") )
- .arg( i18n( "Advanced users will appreciate the Konsole which you can embed into "
+ "(and do not forget to send a complaint to the webmaster!)" ).tqarg("exec:/kcmshell useragent") )
+ .tqarg( i18n( "The <img width='16' height='16' src=\"%1\"> History in your SideBar ensures "
+ "that you can keep track of the pages you have visited recently.").tqarg(history_icon_path) )
+ .tqarg( i18n( "Use a caching <a href=\"%1\">proxy</a> to speed up your"
+ " Internet connection.").tqarg("exec:/kcmshell proxy") )
+ .tqarg( i18n( "Advanced users will appreciate the Konsole which you can embed into "
"Konqueror (Window -> <img width='16' height='16' SRC=\"%1\"> Show "
- "Terminal Emulator).").arg(openterm_icon_path))
- .arg( i18n( "Thanks to <a href=\"%1\">DCOP</a> you can have full control over Konqueror using a script."
-).arg("exec:/kdcop") )
- .arg( i18n( "<img width='16' height='16' src=\"%1\">" ).arg( continue_icon_path ) )
- .arg( i18n( "Next: Specifications" ) )
+ "Terminal Emulator).").tqarg(openterm_icon_path))
+ .tqarg( i18n( "Thanks to <a href=\"%1\">DCOP</a> you can have full control over Konqueror using a script."
+).tqarg("exec:/kdcop") )
+ .tqarg( i18n( "<img width='16' height='16' src=\"%1\">" ).tqarg( continue_icon_path ) )
+ .tqarg( i18n( "Next: Specifications" ) )
;
@@ -413,10 +413,10 @@ TQString KonqAboutPageFactory::plugins()
return *s_plugins_html;
TQString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
- .arg(i18n("Installed Plugins"))
- .arg(i18n("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"))
- .arg(i18n("Installed"))
- .arg(i18n("<td>Mime Type</td><td>Description</td><td>Suffixes</td><td>Plugin</td>"));
+ .tqarg(i18n("Installed Plugins"))
+ .tqarg(i18n("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"))
+ .tqarg(i18n("Installed"))
+ .tqarg(i18n("<td>Mime Type</td><td>Description</td><td>Suffixes</td><td>Plugin</td>"));
if ( res.isEmpty() )
return res;
@@ -489,7 +489,7 @@ void KonqAboutPage::restoreState( TQDataStream &stream )
void KonqAboutPage::serve( const TQString& html, const TQString& what )
{
m_what = what;
- begin( KURL( TQString("about:%1").arg(what) ) );
+ begin( KURL( TQString("about:%1").tqarg(what) ) );
write( html );
end();
m_htmlDoc = html;
@@ -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/specs.html b/konqueror/about/specs.html
index b04212067..4989754cf 100644
--- a/konqueror/about/specs.html
+++ b/konqueror/about/specs.html
@@ -121,7 +121,7 @@
<td valign="top"><a href="http://www.openssl.org">%1<!--OpenSSL--></a></td>
</tr>
<tr bgcolor="#fff4c9">
- <td valign="top">%1<!--Bidirectional 16bit unicode support--></td>
+ <td valign="top">%1<!--Bidirectional 16bit tqunicode support--></td>
<td valign="top">&nbsp;</td>
<td valign="top">%1<!--built-in--></td>
</tr>
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 99a4a82a1..fdc95b961 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.contains( serv->desktopEntryName() + TQString::tqfromLatin1(".desktop") );
}
static int currentScreen()
@@ -248,7 +248,7 @@ static int currentScreen()
// when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile !
static TQCString getPreloadedKonqy()
{
- KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
+ KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true );
cfg.setGroup( "Reusing" );
if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 )
return "";
@@ -301,8 +301,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
// check if user wants to use external browser
// ###### this option seems to have no GUI and to be redundant with BrowserApplication now.
// ###### KDE4: remove
- KConfig config( TQString::fromLatin1("kfmclientrc"));
- config.setGroup( TQString::fromLatin1("Settings"));
+ KConfig config( TQString::tqfromLatin1("kfmclientrc"));
+ config.setGroup( TQString::tqfromLatin1("Settings"));
TQString strBrowser = config.readPathEntry("ExternalBrowser");
if (!strBrowser.isEmpty())
{
@@ -314,7 +314,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
return true;
}
- if (url.protocol().startsWith(TQString::fromLatin1("http")))
+ if (url.protocol().startsWith(TQString::tqfromLatin1("http")))
{
config.setGroup("General");
if (!config.readEntry("BrowserApplication").isEmpty())
@@ -330,7 +330,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
}
}
- KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
+ KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true );
cfg.setGroup( "FMSettings" );
if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) )
{
@@ -361,7 +361,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
{
TQString error;
/* Well, we can't pass a mimetype through startServiceByDesktopPath !
- if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
+ if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"),
url.url(), &error ) > 0 )
{
kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
@@ -391,8 +391,8 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url,
if( appId.isEmpty())
{
TQString error;
- if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
- TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 )
+ if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"),
+ TQString::tqfromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 )
{
kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
return false;
@@ -401,10 +401,10 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url,
// so when we arrive here, konq is up and running already, and appId contains the identification
}
- TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName );
+ TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName );
if ( profile.isEmpty() )
{
- fprintf( stderr, "%s", i18n("Profile %1 not found\n").arg(profileName).local8Bit().data() );
+ fprintf( stderr, "%s", i18n("Profile %1 not found\n").tqarg(profileName).local8Bit().data() );
::exit( 0 );
}
KonquerorIface_stub konqy( appId, "KonquerorIface" );
@@ -479,7 +479,7 @@ bool clientApp::doIt()
}
if ( argc == 3 )
{
- return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::fromLatin1(args->arg(2)) );
+ return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::tqfromLatin1(args->arg(2)) );
}
}
else if ( command == "openProfile" )
@@ -529,7 +529,7 @@ bool clientApp::doIt()
{
KURL::List urls;
urls.append( args->url(1) );
- const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null );
+ const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::tqfromLatin1( "Application" ), TQString::null, TQString::null );
if (offers.isEmpty()) return 1;
KService::Ptr serv = offers.first();
return KRun::run( *serv, urls );
@@ -630,7 +630,7 @@ bool clientApp::doIt()
}
else
{
- fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").arg(TQString::fromLocal8Bit(command)).local8Bit().data() );
+ fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").tqarg(TQString::fromLocal8Bit(command)).local8Bit().data() );
return false;
}
return true;
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index afe91c6ff..7947c82ac 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -206,7 +206,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
setXMLFile( "konq_iconview.rc" );
- // Don't repaint on configuration changes during construction
+ // Don't tqrepaint on configuration changes during construction
m_bInit = true;
m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ),
@@ -359,7 +359,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
// Create the directory lister
m_dirLister = new KDirLister( true );
setDirLister( m_dirLister );
- m_dirLister->setMainWindow(m_pIconView->topLevelWidget());
+ m_dirLister->setMainWindow(m_pIconView->tqtopLevelWidget());
connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ),
this, TQT_SLOT( slotStarted() ) );
@@ -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
@@ -872,8 +872,8 @@ void KonqKfmIconView::slotCanceled( const KURL& url )
// the completed() signal, so handle that case.
if ( !m_pIconView->viewport()->isUpdatesEnabled() )
{
- m_pIconView->viewport()->setUpdatesEnabled( true );
- m_pIconView->viewport()->repaint();
+ m_pIconView->viewport()->tqsetUpdatesEnabled( true );
+ 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()->tqsetUpdatesEnabled( true );
+ m_pIconView->viewport()->tqrepaint();
}
// Root item ? Store root item in konqiconviewwidget (whether 0L or not)
@@ -952,7 +952,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
// We need to disable graphics updates on the iconview when
// inserting items, or else a blank paint operation will be
// performed on the top-left corner for each inserted item!
- m_pIconView->setUpdatesEnabled( false );
+ m_pIconView->tqsetUpdatesEnabled( false );
for (KFileItemListIterator it(entries); it.current(); ++it)
{
//kdDebug(1202) << "KonqKfmIconView::slotNewItem(...)" << _fileitem->url().url() << endl;
@@ -1006,11 +1006,11 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
m_itemDict.insert( *it, item );
}
// After filtering out updates-on-insertions we can re-enable updates
- m_pIconView->setUpdatesEnabled( true );
+ m_pIconView->tqsetUpdatesEnabled( true );
// Locking the viewport has filtered out blanking and now, since we
// have some items to draw, we can restore updating.
if ( !m_pIconView->viewport()->isUpdatesEnabled() )
- m_pIconView->viewport()->setUpdatesEnabled( true );
+ m_pIconView->viewport()->tqsetUpdatesEnabled( true );
KonqDirPart::newItems( entries );
}
@@ -1136,7 +1136,7 @@ void KonqKfmIconView::slotRefreshItems( const KFileItemList& entries )
}
else
{
- // In case we replace a big icon with a small one, need to repaint.
+ // In case we replace a big icon with a small one, need to tqrepaint.
if ( bNeedRepaint )
m_pIconView->updateContents();
}
@@ -1150,7 +1150,7 @@ void KonqKfmIconView::slotClear()
// meaningless paint operations (such as a clear() just before drawing
// fresh contents) we disable updating the viewport until we'll
// receive some data or a timeout timer expires.
- m_pIconView->viewport()->setUpdatesEnabled( false );
+ m_pIconView->viewport()->tqsetUpdatesEnabled( false );
if ( !m_pTimeoutRefreshTimer )
{
m_pTimeoutRefreshTimer = new TQTimer( this );
@@ -1247,9 +1247,9 @@ void KonqKfmIconView::slotRefreshViewport()
kdDebug(1202) << "KonqKfmIconView::slotRefreshViewport()" << endl;
TQWidget * vp = m_pIconView->viewport();
bool prevState = vp->isUpdatesEnabled();
- vp->setUpdatesEnabled( true );
- vp->repaint();
- vp->setUpdatesEnabled( prevState );
+ vp->tqsetUpdatesEnabled( true );
+ vp->tqrepaint();
+ vp->tqsetUpdatesEnabled( prevState );
}
bool KonqKfmIconView::doOpenURL( const KURL & url )
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 03e24d609..1f03665d4 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -32,7 +32,7 @@
#include <stdlib.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqpopupmenu.h>
#include <tqpainter.h>
@@ -345,7 +345,7 @@ void ActionsImpl::slotCopy() {
TQValueList<KBookmark> bookmarks
= ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */);
- kapp->clipboard()->setData(data, TQClipboard::Clipboard);
+ kapp->tqclipboard()->setData(data, TQClipboard::Clipboard);
}
void ActionsImpl::slotPaste() {
@@ -353,7 +353,7 @@ void ActionsImpl::slotPaste() {
KEBMacroCommand *mcmd =
CmdGen::insertMimeSource(
i18n("Paste"),
- kapp->clipboard()->data(TQClipboard::Clipboard),
+ kapp->tqclipboard()->data(TQClipboard::Clipboard),
ListView::self()->userAddress());
CmdHistory::self()->didCommand(mcmd);
}
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index 38e499d1d..edc4a66bb 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -24,9 +24,9 @@
#include <stdlib.h>
#include <tqtimer.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqsplitter.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <klocale.h>
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index 2ad58a682..c7c5f83a6 100644
--- a/konqueror/keditbookmarks/commands.cpp
+++ b/konqueror/keditbookmarks/commands.cpp
@@ -218,7 +218,7 @@ void CreateCommand::unexecute() {
KBookmark bk = CurrentMgr::bookmarkAt(m_to);
Q_ASSERT(!bk.isNull() && !bk.parentGroup().isNull());
- ListView::self()->invalidate(bk.address());
+ ListView::self()->tqinvalidate(bk.address());
bk.parentGroup().deleteBookmark(bk);
}
@@ -643,13 +643,13 @@ KEBMacroCommand* CmdGen::insertMimeSource(
bool modified = false;
const char *format = 0;
for (int i = 0; format = data->format(i), format; i++) {
- // qt docs don't say if encodedData(blah) where
+ // qt docs don't say if tqencodedData(blah) where
// blah is not a stored mimetype should return null
// or not. so, we search. sucky...
if (strcmp(format, "GALEON_BOOKMARK") == 0) {
modified = true;
TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel");
- mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK"));
+ mydrag->setEncodedData(data->tqencodedData("GALEON_BOOKMARK"));
data = mydrag;
break;
} else if( strcmp(format, "application/x-xbel" )==0) {
diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp
index 458e9090b..a31af0c80 100644
--- a/konqueror/keditbookmarks/dcop.cpp
+++ b/konqueror/keditbookmarks/dcop.cpp
@@ -26,7 +26,7 @@
#include <stdlib.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqpopupmenu.h>
#include <tqpainter.h>
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index efeb3d3a1..62702a1c3 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -29,7 +29,7 @@
#include <stdlib.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqpopupmenu.h>
#include <tqpainter.h>
#include <tqheader.h>
@@ -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());
}
}
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index 7ffe76c37..c05226ff6 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -56,7 +56,7 @@ public:
void setTmpStatus(const TQString &);
void restoreStatus();
- void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
+ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
void setSelected ( bool s );
virtual void setOpen(bool);
@@ -140,8 +140,8 @@ public:
// selected item stuff
void selected(KEBListViewItem * item, bool s);
- void invalidate(const TQString & address);
- void invalidate(TQListViewItem * item);
+ void tqinvalidate(const TQString & address);
+ void tqinvalidate(TQListViewItem * item);
void fixUpCurrent(const TQString & address);
KEBListViewItem * firstSelected() const;
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 5b238302f..2abf26401 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -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/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 36400c3b0..148a8b5ca 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -32,9 +32,9 @@
#include <stdlib.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqsplitter.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <klocale.h>
@@ -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(TQT_TQDATE_OBJECT(dt.date()), false)
: KGlobal::locale()->formatDateTime(dt, false);
}
@@ -233,11 +233,11 @@ KEBApp::KEBApp(
vsplitter->setOrientation(Qt::Vertical);
vsplitter->setSizes(TQValueList<int>() << h << 380
- << m_bkinfo->sizeHint().height() );
+ << m_bkinfo->tqsizeHint().height() );
setCentralWidget(vsplitter);
- resize(ListView::self()->widget()->sizeHint().width(),
- vsplitter->sizeHint().height());
+ resize(ListView::self()->widget()->tqsizeHint().width(),
+ vsplitter->tqsizeHint().height());
createActions();
if (m_browser)
@@ -247,7 +247,7 @@ KEBApp::KEBApp(
m_dcopIface = new KBookmarkEditorIface();
- connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ),
+ connect(kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ),
TQT_SLOT( slotClipboardDataChanged() ));
ListView::self()->connectSignals();
@@ -319,7 +319,7 @@ void KEBApp::slotClipboardDataChanged() {
// kdDebug() << "KEBApp::slotClipboardDataChanged" << endl;
if (!m_readOnly) {
m_canPaste = KBookmarkDrag::canDecode(
- kapp->clipboard()->data(TQClipboard::Clipboard));
+ kapp->tqclipboard()->data(TQClipboard::Clipboard));
updateActions();
}
}
diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc
index df25a5e6c..e60761b9c 100644
--- a/konqueror/konq_actions.cc
+++ b/konqueror/konq_actions.cc
@@ -48,12 +48,12 @@ void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList<HistoryEntry> &his
{
assert ( popup ); // kill me if this 0... :/
- //kdDebug(1202) << "fillHistoryPopup position: " << history.at() << endl;
+ //kdDebug(1202) << "fillHistoryPopup position: " << history.tqat() << endl;
HistoryEntry * current = history.current();
TQPtrListIterator<HistoryEntry> it( history );
if (onlyBack || onlyForward)
{
- it += history.at(); // Jump to current item
+ it += history.tqat(); // Jump to current item
if ( !onlyForward ) --it; else ++it; // And move off it
} else if ( startPos )
it += startPos; // Jump to specified start pos
@@ -75,7 +75,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList<HistoryEntry> &his
break;
if ( !onlyForward ) --it; else ++it;
}
- //kdDebug(1202) << "After fillHistoryPopup position: " << history.at() << endl;
+ //kdDebug(1202) << "After fillHistoryPopup position: " << history.tqat() << endl;
}
///////////////////////////////
@@ -116,7 +116,7 @@ void KonqBidiHistoryAction::fillGoMenu( const TQPtrList<HistoryEntry> & history
if (history.isEmpty())
return; // nothing to do
- //kdDebug(1202) << "fillGoMenu position: " << history.at() << endl;
+ //kdDebug(1202) << "fillGoMenu position: " << history.tqat() << endl;
if ( m_firstIndex == 0 ) // should never happen since done in plug
m_firstIndex = m_goMenu->count();
else
@@ -136,10 +136,10 @@ void KonqBidiHistoryAction::fillGoMenu( const TQPtrList<HistoryEntry> & history
// Second case: big history, in one or both directions
{
// Assume both directions first (in this case we place the current URL in the middle)
- m_startPos = history.at() + 4;
+ m_startPos = history.tqat() + 4;
// Forward not big enough ?
- if ( history.at() > (int)history.count() - 4 )
+ if ( history.tqat() > (int)history.count() - 4 )
m_startPos = history.count() - 1;
}
Q_ASSERT( m_startPos >= 0 && (uint)m_startPos < history.count() );
@@ -148,7 +148,7 @@ void KonqBidiHistoryAction::fillGoMenu( const TQPtrList<HistoryEntry> & history
kdWarning() << "m_startPos=" << m_startPos << " history.count()=" << history.count() << endl;
return;
}
- m_currentPos = history.at(); // for slotActivated
+ m_currentPos = history.tqat(); // for slotActivated
KonqBidiHistoryAction::fillHistoryPopup( history, m_goMenu, false, false, true, m_startPos );
}
@@ -444,7 +444,7 @@ void KonqMostOftenURLSAction::slotFillMenu()
m_popupList.clear();
int id = s_mostEntries->count() -1;
- KonqHistoryEntry *entry = s_mostEntries->at( id );
+ KonqHistoryEntry *entry = s_mostEntries->tqat( id );
while ( entry ) {
// we take either title, typedURL or URL (in this order)
TQString text = entry->title.isEmpty() ? (entry->typedURL.isEmpty() ?
@@ -459,7 +459,7 @@ void KonqMostOftenURLSAction::slotFillMenu()
// This prevents crashes when another process tells us to remove an entry.
m_popupList.prepend( entry->url );
- entry = (id > 0) ? s_mostEntries->at( --id ) : 0L;
+ entry = (id > 0) ? s_mostEntries->tqat( --id ) : 0L;
}
setEnabled( !s_mostEntries->isEmpty() );
Q_ASSERT( s_mostEntries->count() == m_popupList.count() );
diff --git a/konqueror/konq_actions.h b/konqueror/konq_actions.h
index 849d45668..41dbdad71 100644
--- a/konqueror/konq_actions.h
+++ b/konqueror/konq_actions.h
@@ -62,7 +62,7 @@ signals:
private:
uint m_firstIndex; // first index in the Go menu
int m_startPos;
- int m_currentPos; // == history.at()
+ int m_currentPos; // == history.tqat()
TQPopupMenu *m_goMenu; // hack
};
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index d958400fd..3d1a1003f 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 );
@@ -272,14 +272,14 @@ void KonqCombo::updateItem( const TQPixmap& pix, const TQString& t, int index, c
listBox()->changeItem( item, index );
/*
- setUpdatesEnabled( false );
- lineEdit()->setUpdatesEnabled( false );
+ tqsetUpdatesEnabled( false );
+ lineEdit()->tqsetUpdatesEnabled( false );
removeItem( index );
insertItem( pix, t, index );
- setUpdatesEnabled( true );
- lineEdit()->setUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
+ lineEdit()->tqsetUpdatesEnabled( true );
update();
*/
}
@@ -301,13 +301,13 @@ void KonqCombo::updatePixmaps()
{
saveState();
- setUpdatesEnabled( false );
+ tqsetUpdatesEnabled( false );
KonqPixmapProvider *prov = KonqPixmapProvider::self();
for ( int i = 1; i < count(); i++ ) {
updateItem( prov->pixmapFor( text( i ) ), text( i ), i, titleOfURL( text( i ) ) );
}
- setUpdatesEnabled( true );
- repaint();
+ tqsetUpdatesEnabled( true );
+ tqrepaint();
restoreState();
}
@@ -521,15 +521,15 @@ void KonqCombo::slotRemoved( const TQString& item )
void KonqCombo::removeURL( const TQString& url )
{
- setUpdatesEnabled( false );
- lineEdit()->setUpdatesEnabled( false );
+ tqsetUpdatesEnabled( false );
+ lineEdit()->tqsetUpdatesEnabled( false );
removeFromHistory( url );
applyPermanent();
setTemporary( currentText() );
- setUpdatesEnabled( true );
- lineEdit()->setUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
+ lineEdit()->tqsetUpdatesEnabled( true );
update();
}
@@ -540,7 +540,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) {
// check if the pixmap was clicked
int x = e->pos().x();
- int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
+ int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
if ( x > x0 + 2 && x < lineEdit()->x() ) {
m_dragStart = e->pos();
@@ -551,7 +551,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
// check if the lock icon was clicked
int x = e->pos().x();
- int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x();
+ int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x();
if ( x < x0 )
emit showPageSecurity();
@@ -605,7 +605,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe )
TQLineEdit *edit = lineEdit();
TQRect re = tqstyle().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);
@@ -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()->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) -
- 2 * listBox()->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+ int entryWidth = listBox()->width() - listBox()->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) -
+ 2 * listBox()->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
int titleWidth = ( entryWidth / 3 ) - 1;
int urlWidth = entryWidth - titleWidth - pmWidth - 2;
@@ -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 56ecc6f58..93bccfc01 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cc
@@ -14,7 +14,7 @@
*************************************************************************
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <kconfig.h>
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc
index 9f5d8fc94..e918f1ac3 100644
--- a/konqueror/konq_factory.cc
+++ b/konqueror/konq_factory.cc
@@ -42,7 +42,7 @@ 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,
diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc
index e6fe07d25..d8c80b234 100644
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cc
@@ -19,7 +19,7 @@
#include <math.h>
#include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwhatsthis.h>
#include <tqtoolbutton.h>
#include <tqtabbar.h>
@@ -68,20 +68,20 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
setSizeGripEnabled( false );
m_led = new TQLabel( this );
- m_led->setAlignment( Qt::AlignCenter );
- m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
+ m_led->tqsetAlignment( Qt::AlignCenter );
+ m_led->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
addWidget( m_led, 0, false ); // led (active view indicator)
m_led->hide();
m_pStatusLabel = new KSqueezedTextLabel( this );
m_pStatusLabel->setMinimumSize( 0, 0 );
- m_pStatusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
+ m_pStatusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
m_pStatusLabel->installEventFilter(this);
addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label
m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" );
m_pLinkedViewCheckBox->setFocusPolicy(TQ_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 "
@@ -274,7 +274,7 @@ void KonqFrameStatusBar::updateActiveStatus()
bool hasFocus = m_pParentKonqFrame->isActivePart();
- const TQColorGroup& activeCg = kapp->palette().active();
+ const TQColorGroup& activeCg = kapp->tqpalette().active();
setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() );
static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) );
@@ -301,7 +301,7 @@ KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer,
// the frame statusbar
m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar");
- m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ m_pStatusBar->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked()));
connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) );
m_separator = 0;
@@ -327,16 +327,16 @@ void KonqFrame::listViews( ChildViewList *viewList )
void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ )
{
if (saveURLs)
- config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ),
+ config->writePathEntry( TQString::tqfromLatin1( "URL" ).prepend( prefix ),
childView()->url().url() );
- config->writeEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() );
- config->writeEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() );
- config->writeEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() );
- config->writeEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() );
- config->writeEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() );
- config->writeEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() );
- //config->writeEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() );
- if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true );
+ config->writeEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() );
+ config->writeEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() );
+ config->writeEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() );
+ config->writeEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() );
+ config->writeEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() );
+ config->writeEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() );
+ //config->writeEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() );
+ if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true );
KonqConfigEvent ev( config, prefix+"_", true/*save*/);
TQApplication::sendEvent( childView()->part(), &ev );
@@ -352,8 +352,8 @@ void KonqFrame::printFrameInfo( const TQString& spaces )
{
TQString className = "NoPart";
if (part()) className = part()->widget()->className();
- kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").arg(isVisible()) << " containing view "
- << childView() << " visible=" << TQString("%1").arg(isVisible())
+ kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").tqarg(isVisible()) << " containing view "
+ << childView() << " visible=" << TQString("%1").tqarg(isVisible())
<< " and part " << part() << " whose widget is a " << className << endl;
}
@@ -463,7 +463,7 @@ KonqFrame::paintEvent( TQPaintEvent* )
#ifdef USE_QT4
#warning [INFO] Repaint call disabled in Qt4 to prevent recursive repaint (which otherwise occurs for unknown reasons)
#else // USE_QT4
- m_pStatusBar->repaint();
+ m_pStatusBar->tqrepaint();
#endif // USE_QT4
}
@@ -521,40 +521,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 );
}
@@ -580,7 +580,7 @@ KonqFrameBase* KonqFrameContainer::otherChild( KonqFrameBase* child )
void KonqFrameContainer::printFrameInfo( const TQString& spaces )
{
- kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").arg(isVisible())
+ kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").tqarg(isVisible())
<< " activeChild=" << m_pActiveChild << endl;
if (!m_pActiveChild)
kdDebug(1202) << "WARNING: " << this << " has a null active child!" << endl;
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc
index caf909d68..c9556f824 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cc
@@ -191,7 +191,7 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
TQString name = (*cIt)->desktopEntryName();
//kdDebug(1202) << "ToggleViewGUIClient: name=" << name << endl;
KToggleAction *action = new KToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() );
- action->setCheckedState( i18n( "Hide %1" ).arg( (*cIt)->name() ) );
+ action->setCheckedState( i18n( "Hide %1" ).tqarg( (*cIt)->name() ) );
// HACK
if ( (*cIt)->icon() != "unknown" )
@@ -230,7 +230,7 @@ TQPtrList<KAction> ToggleViewGUIClient::actions() const
void ToggleViewGUIClient::slotToggleView( bool toggle )
{
- TQString serviceName = TQString::fromLatin1( TQT_TQOBJECT_CONST(sender())->name() );
+ TQString serviceName = TQString::tqfromLatin1( TQT_TQOBJECT_CONST(sender())->name() );
bool horizontal = m_mapOrientation[ serviceName ];
@@ -240,7 +240,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
{
KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal,
- TQString::fromLatin1( "Browser/View" ),
+ TQString::tqfromLatin1( "Browser/View" ),
serviceName,
!horizontal /* vertical = make it first */);
diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc
index 3f3e47bc3..17888e8c8 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 8f3021739..f08fc10db 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -60,10 +60,10 @@
#include <unistd.h>
#include <tqfile.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqmetaobject.h>
#include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqfileinfo.h>
#include <tqwhatsthis.h>
@@ -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 )
{
@@ -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.
@@ -1336,12 +1336,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 );
}
@@ -1528,7 +1528,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!)
@@ -1652,7 +1652,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" ) );
@@ -1815,7 +1815,7 @@ void KonqMainWindow::slotReload( KonqView* reloadView )
if ( !reloadView || reloadView->url().isEmpty() )
return;
- if ( reloadView->part() && (reloadView->part()->metaObject()->findProperty("modified") != -1) ) {
+ if ( reloadView->part() && (reloadView->part()->tqmetaObject()->findProperty("modified") != -1) ) {
TQVariant prop = reloadView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
@@ -2032,7 +2032,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 );
@@ -2048,7 +2048,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() )
@@ -2665,7 +2665,7 @@ 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,
@@ -2682,7 +2682,7 @@ void KonqMainWindow::slotBreakOffTabPopup()
{
KonqView* originalView = m_currentView;
KonqView *view = m_pWorkingTab->activeChildView();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
+ if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
@@ -2787,7 +2787,7 @@ void KonqMainWindow::openMultiURL( KURL::List url )
void KonqMainWindow::slotRemoveView()
{
if (m_currentView && m_currentView->part() &&
- (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) {
+ (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) {
TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this,
@@ -2803,7 +2803,7 @@ 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,
@@ -2819,7 +2819,7 @@ void KonqMainWindow::slotRemoveTabPopup()
{
KonqView *originalView = m_currentView;
KonqView *view = m_pWorkingTab->activeChildView();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
+ if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
@@ -2856,7 +2856,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup()
MapViews::ConstIterator end = m_mapViews.end();
for (; it != end; ++it ) {
KonqView *view = it.data();
- if ( view != originalView && view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
+ if ( view != originalView && view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
@@ -2889,7 +2889,7 @@ void KonqMainWindow::slotReloadAllTabs()
MapViews::ConstIterator end = m_mapViews.end();
for (; it != end; ++it ) {
KonqView *view = it.data();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
+ if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
@@ -3454,7 +3454,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() )
//{
@@ -3494,7 +3494,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) );
- connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+ connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) );
connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) );
@@ -3535,7 +3535,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) );
- disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+ disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) );
disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) );
@@ -3563,7 +3563,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
void KonqMainWindow::slotClipboardDataChanged()
{
//kdDebug(1202) << "KonqMainWindow::slotClipboardDataChanged()" << endl;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
m_paPaste->setEnabled( data->provides( "text/plain" ) );
slotCheckComboSelection();
}
@@ -3583,7 +3583,7 @@ void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, TQt::Butto
m_combo->clearTemporary();
focusLocationBar();
if ( state & Qt::MidButton )
- m_combo->setURL( TQApplication::clipboard()->text( TQClipboard::Selection ) );
+ m_combo->setURL( TQApplication::tqclipboard()->text( TQClipboard::Selection ) );
}
void KonqMainWindow::slotForceSaveMainWindowSettings()
@@ -4327,7 +4327,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 )
{
@@ -4361,7 +4361,7 @@ 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 )
{
@@ -4888,7 +4888,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 || !::tqqt_cast<TQLineEdit*>( fw ) )
m_oldView->part()->widget()->setFocus();
}
@@ -5111,7 +5111,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, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() );
else
@@ -5282,7 +5282,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" ) )
{
@@ -5320,7 +5320,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
MapViews::ConstIterator end = m_mapViews.end();
for (; it != end; ++it ) {
KonqView *view = it.data();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) {
+ if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view );
@@ -5338,7 +5338,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
// m_pViewManager->showTab( originalView );
}
else if ( m_currentView && m_currentView->part() &&
- (m_currentView->part()->metaObject()->findProperty("modified") != -1) )
+ (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) )
{
TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool())
diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc
index 5802d47c9..5c65e872f 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( TQt::PaletteButton );
- setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
+ tqsetAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
Qt::AlignVCenter | TQt::ShowPrefix );
setAcceptDrops(true);
adjustSize();
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 2a3547068..eca415ba5 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 eb3048726..3fb199d88 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -22,7 +22,7 @@
#include "konq_tabs.h"
#include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqptrlist.h>
#include <tqpopupmenu.h>
#include <tqtoolbutton.h>
@@ -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() );
}
@@ -218,14 +218,14 @@ void KonqFrameTabs::copyHistory( KonqFrameBase *other )
for (uint i = 0; i < m_pChildFrameList->count(); i++ )
{
- m_pChildFrameList->at(i)->copyHistory( static_cast<KonqFrameTabs *>( other )->m_pChildFrameList->at(i) );
+ m_pChildFrameList->tqat(i)->copyHistory( static_cast<KonqFrameTabs *>( other )->m_pChildFrameList->tqat(i) );
}
}
void KonqFrameTabs::printFrameInfo( const TQString& spaces )
{
kdDebug(1202) << spaces << "KonqFrameTabs " << this << " visible="
- << TQString("%1").arg(isVisible()) << " activeChild="
+ << TQString("%1").tqarg(isVisible()) << " activeChild="
<< m_pActiveChild << endl;
if (!m_pActiveChild)
@@ -234,7 +234,7 @@ void KonqFrameTabs::printFrameInfo( const TQString& spaces )
KonqFrameBase* child;
int childFrameCount = m_pChildFrameList->count();
for (int i = 0 ; i < childFrameCount ; i++) {
- child = m_pChildFrameList->at(i);
+ child = m_pChildFrameList->tqat(i);
if (child != 0L)
child->printFrameInfo(spaces + " ");
else
@@ -346,7 +346,7 @@ void KonqFrameTabs::moveTabForward( int index )
void KonqFrameTabs::slotMovedTab( int from, int to )
{
- KonqFrameBase* fromFrame = m_pChildFrameList->at( from );
+ KonqFrameBase* fromFrame = m_pChildFrameList->tqat( from );
m_pChildFrameList->remove( fromFrame );
m_pChildFrameList->insert( to, fromFrame );
@@ -440,8 +440,8 @@ void KonqFrameTabs::slotSubPopupMenuTabActivated( int _id)
void KonqFrameTabs::slotMouseMiddleClick()
{
- TQApplication::clipboard()->setSelectionMode( TQClipboard::Selection );
- KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
+ TQApplication::tqclipboard()->setSelectionMode( TQClipboard::Selection );
+ KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::tqclipboard()->text() ) );
if ( !filteredURL.isEmpty() ) {
KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false);
if (newView == 0L) return;
@@ -461,8 +461,8 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w )
}
}
else {
- TQApplication::clipboard()->setSelectionMode( TQClipboard::Selection );
- KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
+ TQApplication::tqclipboard()->setSelectionMode( TQClipboard::Selection );
+ KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::tqclipboard()->text() ) );
if ( !filteredURL.isEmpty() ) {
KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w);
if (frame) {
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index 8037b3927..4f02022d4 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -117,7 +117,7 @@ KonqView::~KonqView()
if (part_url.isNull())
part_url = "";
TQCString line;
- line = ( TQString("close(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8();
+ line = ( TQString("close(%1):%2\n").tqarg(m_randID,0,16).tqarg(part_url) ).utf8();
KonqMainWindow::s_crashlog_file->writeBlock(line, line.length());
KonqMainWindow::s_crashlog_file->flush();
}
@@ -155,9 +155,9 @@ void KonqView::openURL( const KURL &url, const TQString & locationBarURL,
TQCString line;
- line = ( TQString("closed(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8();
+ line = ( TQString("closed(%1):%2\n").tqarg(m_randID,0,16).tqarg(part_url) ).utf8();
KonqMainWindow::s_crashlog_file->writeBlock(line,line.length());
- line = ( TQString("opened(%3):%4\n").arg(m_randID,0,16).arg(url_url) ).utf8();
+ line = ( TQString("opened(%3):%4\n").tqarg(m_randID,0,16).tqarg(url_url) ).utf8();
KonqMainWindow::s_crashlog_file->writeBlock(line,line.length());
KonqMainWindow::s_crashlog_file->flush();
}
@@ -227,7 +227,7 @@ void KonqView::openURL( const KURL &url, const TQString & locationBarURL,
KonqHistoryManager::kself()->addPending( url, locationBarURL, TQString::null);
#ifdef DEBUG_HISTORY
- kdDebug(1202) << "Current position : " << m_lstHistory.at() << endl;
+ kdDebug(1202) << "Current position : " << m_lstHistory.tqat() << endl;
#endif
}
@@ -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 ) ) );
@@ -711,7 +711,7 @@ void KonqView::createHistoryEntry()
#ifdef DEBUG_HISTORY
kdDebug(1202) << "Truncating history" << endl;
#endif
- m_lstHistory.at( m_lstHistory.count() - 1 ); // go to last one
+ m_lstHistory.tqat( m_lstHistory.count() - 1 ); // go to last one
for ( ; m_lstHistory.current() != current ; )
{
if ( !m_lstHistory.removeLast() ) // and remove from the end (faster and easier)
@@ -720,7 +720,7 @@ void KonqView::createHistoryEntry()
// makes current() null if it's the last item. however in qt2
// the behaviour was different than the documentation. this is
// changed in qt3 to behave as documented ;-) (Simon)
- m_lstHistory.at( m_lstHistory.count() - 1 );
+ m_lstHistory.tqat( m_lstHistory.count() - 1 );
}
// Now current is the current again.
}
@@ -730,9 +730,9 @@ void KonqView::createHistoryEntry()
#endif
m_lstHistory.append( new HistoryEntry ); // made current
#ifdef DEBUG_HISTORY
- kdDebug(1202) << "at=" << m_lstHistory.at() << " count=" << m_lstHistory.count() << endl;
+ kdDebug(1202) << "at=" << m_lstHistory.tqat() << " count=" << m_lstHistory.count() << endl;
#endif
- assert( m_lstHistory.at() == (int) m_lstHistory.count() - 1 );
+ assert( m_lstHistory.tqat() == (int) m_lstHistory.count() - 1 );
}
void KonqView::updateHistoryEntry( bool saveLocationBarURL )
@@ -752,20 +752,20 @@ void KonqView::updateHistoryEntry( bool saveLocationBarURL )
}
#ifdef DEBUG_HISTORY
- kdDebug(1202) << "Saving part URL : " << m_pPart->url() << " in history position " << m_lstHistory.at() << endl;
+ kdDebug(1202) << "Saving part URL : " << m_pPart->url() << " in history position " << m_lstHistory.tqat() << endl;
#endif
current->url = m_pPart->url();
if (saveLocationBarURL)
{
#ifdef DEBUG_HISTORY
- kdDebug(1202) << "Saving location bar URL : " << m_sLocationBarURL << " in history position " << m_lstHistory.at() << endl;
+ kdDebug(1202) << "Saving location bar URL : " << m_sLocationBarURL << " in history position " << m_lstHistory.tqat() << endl;
#endif
current->locationBarURL = m_sLocationBarURL;
current->pageSecurity = m_pageSecurity;
}
#ifdef DEBUG_HISTORY
- kdDebug(1202) << "Saving title : " << m_caption << " in history position " << m_lstHistory.at() << endl;
+ kdDebug(1202) << "Saving title : " << m_caption << " in history position " << m_lstHistory.tqat() << endl;
#endif
current->title = m_caption;
current->strServiceType = m_serviceType;
@@ -800,7 +800,7 @@ void KonqView::go( int steps )
return;
}
- int newPos = m_lstHistory.at() + steps;
+ int newPos = m_lstHistory.tqat() + steps;
#ifdef DEBUG_HISTORY
kdDebug(1202) << "go : steps=" << steps
<< " newPos=" << newPos
@@ -813,13 +813,13 @@ void KonqView::go( int steps )
stop();
// Yay, we can move there without a loop !
- HistoryEntry *currentHistoryEntry = m_lstHistory.at( newPos ); // sets current item
+ HistoryEntry *currentHistoryEntry = m_lstHistory.tqat( newPos ); // sets current item
assert( currentHistoryEntry );
- assert( newPos == m_lstHistory.at() ); // check we moved (i.e. if I understood the docu)
+ assert( newPos == m_lstHistory.tqat() ); // check we moved (i.e. if I understood the docu)
assert( currentHistoryEntry == m_lstHistory.current() );
#ifdef DEBUG_HISTORY
- kdDebug(1202) << "New position " << m_lstHistory.at() << endl;
+ kdDebug(1202) << "New position " << m_lstHistory.tqat() << endl;
#endif
restoreHistory();
@@ -866,7 +866,7 @@ void KonqView::restoreHistory()
m_pMainWindow->updateToolBarActions();
#ifdef DEBUG_HISTORY
- kdDebug(1202) << "New position (2) " << m_lstHistory.at() << endl;
+ kdDebug(1202) << "New position (2) " << m_lstHistory.tqat() << endl;
#endif
}
@@ -874,9 +874,9 @@ const HistoryEntry * KonqView::historyAt(const int pos)
{
if(pos<0 || pos>=(int)m_lstHistory.count())
return 0L;
- int oldpos = m_lstHistory.at();
- const HistoryEntry* h = m_lstHistory.at(pos);
- m_lstHistory.at( oldpos );
+ int oldpos = m_lstHistory.tqat();
+ const HistoryEntry* h = m_lstHistory.tqat(pos);
+ m_lstHistory.tqat( oldpos );
return h;
}
@@ -887,7 +887,7 @@ void KonqView::copyHistory( KonqView *other )
TQPtrListIterator<HistoryEntry> it( other->m_lstHistory );
for (; it.current(); ++it )
m_lstHistory.append( new HistoryEntry( *it.current() ) );
- m_lstHistory.at(other->m_lstHistory.at());
+ m_lstHistory.tqat(other->m_lstHistory.tqat());
}
KURL KonqView::url() const
@@ -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;
TQUObject 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;
TQUObject 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;
TQUObject 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;
TQUObject o[ 2 ];
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 1329000f8..d251da53b 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -125,17 +125,17 @@ public:
/**
* @return true if view can go back
*/
- bool canGoBack()const { return m_lstHistory.at() > 0; }
+ bool canGoBack()const { return m_lstHistory.tqat() > 0; }
/**
* @return true if view can go forward
*/
- bool canGoForward()const { return m_lstHistory.at() != ((int)m_lstHistory.count())-1; }
+ bool canGoForward()const { return m_lstHistory.tqat() != ((int)m_lstHistory.count())-1; }
/**
* @return the position in the history
*/
- int historyPos() const { return m_lstHistory.at(); }
+ int historyPos() const { return m_lstHistory.tqat(); }
uint historyLength() { return m_lstHistory.count(); }
@@ -149,7 +149,7 @@ public:
*/
void restoreHistory();
- void setHistoryPos(int newPos) { m_lstHistory.at( newPos ); }
+ void setHistoryPos(int newPos) { m_lstHistory.tqat( newPos ); }
/**
* @return the history of this view
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index b57ae53bc..423929f39 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -132,7 +132,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
//printSizeInfo( splitFrame, parentContainer, "before split");
#endif
- parentContainer->widget()->setUpdatesEnabled( false );
+ parentContainer->widget()->tqsetUpdatesEnabled( false );
//kdDebug(1202) << "Move out child" << endl;
TQPoint pos = splitFrame->widget()->pos();
@@ -184,7 +184,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
//newView->frame()->show();
newContainer->show();
- parentContainer->widget()->setUpdatesEnabled( true );
+ parentContainer->widget()->tqsetUpdatesEnabled( true );
if (m_pDocContainer == splitFrame) m_pDocContainer = newContainer;
@@ -226,7 +226,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
KonqFrameBase* mainFrame = m_pMainWindow->childFrame();
- mainFrame->widget()->setUpdatesEnabled( false );
+ mainFrame->widget()->tqsetUpdatesEnabled( false );
//kdDebug(1202) << "Move out child" << endl;
TQPoint pos = mainFrame->widget()->pos();
@@ -249,7 +249,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
newContainer->show();
- mainFrame->widget()->setUpdatesEnabled( true );
+ mainFrame->widget()->tqsetUpdatesEnabled( true );
if( childView )
childView->openURL( url, locationBarURL );
@@ -279,7 +279,7 @@ void KonqViewManager::convertDocContainer()
splitterSizes = static_cast<KonqFrameContainer*>(parentContainer)->sizes();
}
- parentContainer->widget()->setUpdatesEnabled( false );
+ parentContainer->widget()->tqsetUpdatesEnabled( false );
//kdDebug(1202) << "Move out child" << endl;
TQPoint pos = m_pDocContainer->widget()->pos();
@@ -302,7 +302,7 @@ void KonqViewManager::convertDocContainer()
newContainer->show();
- parentContainer->widget()->setUpdatesEnabled( true );
+ parentContainer->widget()->tqsetUpdatesEnabled( true );
m_pDocContainer = newContainer;
}
@@ -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 );
@@ -784,7 +784,7 @@ void KonqViewManager::removeView( KonqView *view )
if (m_pDocContainer == parentContainer) m_pDocContainer = otherFrame;
- grandParentContainer->widget()->setUpdatesEnabled( false );
+ grandParentContainer->widget()->tqsetUpdatesEnabled( false );
static_cast<KonqFrameContainer*>(parentContainer)->setAboutToBeDeleted();
//kdDebug(1202) << "--- Reparenting otherFrame to m_pMainWindow " << m_pMainWindow << endl;
@@ -826,7 +826,7 @@ void KonqViewManager::removeView( KonqView *view )
grandParentContainer->setActiveChild( otherFrame );
grandParentContainer->activateChild();
- grandParentContainer->widget()->setUpdatesEnabled( true );
+ grandParentContainer->widget()->tqsetUpdatesEnabled( true );
}
else if (parentContainer->frameType()=="Tabs") {
kdDebug(1202) << "parentContainer " << parentContainer << " is a KonqFrameTabs" << endl;
@@ -1077,7 +1077,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString & profileName, bool saveURLs, bool saveWindowSize )
{
- TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) +
+ TQString path = locateLocal( "data", TQString::tqfromLatin1( "konqueror/profiles/" ) +
fileName, KGlobal::instance() );
if ( TQFile::exists( path ) )
@@ -1096,7 +1096,7 @@ void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWi
{
//kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl;
if( m_pMainWindow->childFrame() != 0L ) {
- TQString prefix = TQString::fromLatin1( m_pMainWindow->childFrame()->frameType() )
+ TQString prefix = TQString::tqfromLatin1( m_pMainWindow->childFrame()->frameType() )
+ TQString::number(0);
cfg.writeEntry( "RootItem", prefix );
prefix.append( '_' );
@@ -1156,7 +1156,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename,
for ( it.toFirst(); it != 0L; ++it )
{
KonqView *view = it.current()->activeChildView();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) {
+ if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1)) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) {
showTab( view );
@@ -1175,7 +1175,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename,
else
{
KonqView *view = m_pMainWindow->currentView();
- if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) {
+ if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1)) {
TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( 0,
@@ -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,11 +1608,11 @@ 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 );
- loadItem( cfg, newContainer, childList.at(1), defaultURL, openURL );
+ loadItem( cfg, newContainer, childList.tqat(0), defaultURL, openURL );
+ loadItem( cfg, newContainer, childList.tqat(1), defaultURL, openURL );
newContainer->setSizes( sizes );
@@ -1634,9 +1634,9 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
parent->insertChildFrame( newContainer );
m_pDocContainer = newContainer;
- int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), 0 );
+ int index = cfg.readNumEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend(prefix), 0 );
- TQStringList childList = cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ) );
+ TQStringList childList = cfg.readListEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ) );
for ( TQStringList::Iterator it = childList.begin(); it != childList.end(); ++it )
{
loadItem( cfg, newContainer, *it, defaultURL, openURL );
diff --git a/konqueror/kttsplugin/khtmlkttsd.cpp b/konqueror/kttsplugin/khtmlkttsd.cpp
index e832bd27a..1ddba4d93 100644
--- a/konqueror/kttsplugin/khtmlkttsd.cpp
+++ b/konqueror/kttsplugin/khtmlkttsd.cpp
@@ -118,13 +118,13 @@ void KHTMLPluginKTTSD::slotReadOut()
}
// kdDebug() << "KHTMLPluginKTTSD::slotReadOut: query = " << query << endl;
- dataBuf.at(0); // reset data
+ dataBuf.tqat(0); // reset data
arg << query << "";
if ( !client->call("kttsd", "KSpeech", "setText(TQString,TQString)",
data, replyType, replyData, true) )
TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ),
i18n( "The DCOP call setText failed." ));
- dataBuf.at(0);
+ dataBuf.tqat(0);
arg << 0;
if ( !client->call("kttsd", "KSpeech", "startText(uint)",
data, replyType, replyData, true) )
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index b06baaf7d..842f870ec 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -206,7 +206,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled )
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
-void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
{
TQColorGroup cg( _cg );
@@ -242,7 +242,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup &
_width = newWidth;
}
- KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
+ KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment );
}
void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r )
diff --git a/konqueror/listview/konq_infolistviewitem.h b/konqueror/listview/konq_infolistviewitem.h
index e81928118..2ba7b8067 100644
--- a/konqueror/listview/konq_infolistviewitem.h
+++ b/konqueror/listview/konq_infolistviewitem.h
@@ -56,7 +56,7 @@ class KonqInfoListViewItem : public KonqBaseListViewItem
virtual ~KonqInfoListViewItem() { }
virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg,
- int column, int width, int alignment );
+ int column, int width, int tqalignment );
virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r );
virtual void updateContents();
virtual void setDisabled( bool disabled );
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index ff829c4c0..6adf36feb 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -181,8 +181,8 @@ void KonqInfoListViewWidget::rebuildView()
if ( !viewport()->isUpdatesEnabled() )
{
- viewport()->setUpdatesEnabled( true );
- setUpdatesEnabled( true );
+ viewport()->tqsetUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
triggerUpdate();
}
}
@@ -215,8 +215,8 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
if ( !viewport()->isUpdatesEnabled() )
{
- viewport()->setUpdatesEnabled( true );
- setUpdatesEnabled( true );
+ viewport()->tqsetUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
triggerUpdate();
}
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index 040da4b10..61e30d269 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -37,7 +37,7 @@
#include <kmimetype.h>
#include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqheader.h>
#include <tqregexp.h>
@@ -144,7 +144,7 @@ void ListViewBrowserExtension::updateActions()
void ListViewBrowserExtension::copySelection( bool move )
{
KonqDrag *urlData = new KonqDrag( m_listView->listViewWidget()->selectedUrls(false), m_listView->listViewWidget()->selectedUrls(true), move );
- TQApplication::clipboard()->setData( urlData );
+ TQApplication::tqclipboard()->setData( urlData );
}
void ListViewBrowserExtension::paste()
@@ -169,7 +169,7 @@ void ListViewBrowserExtension::rename()
const TQString txt = le->text();
TQString pattern;
KMimeType::diagnoseFileName( txt, pattern );
- if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1)
+ if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.find('*',1)==-1)
le->setSelection(0, txt.length()-pattern.stripWhiteSpace().length()+1);
else
{
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index 016f3d77a..b47e43ede 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.
@@ -234,7 +234,7 @@ const TQPixmap* KonqListViewItem::pixmap( int column ) const
if ((int)m_pixmaps.count() <= column)
return 0;
- TQPixmap *pm = m_pixmaps.at( column, &ok );
+ TQPixmap *pm = m_pixmaps.tqat( column, &ok );
if( !ok )
return 0;
return pm;
@@ -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 b54f1c2db..8e78b10f0 100644
--- a/konqueror/listview/konq_listviewitems.h
+++ b/konqueror/listview/konq_listviewitems.h
@@ -107,7 +107,7 @@ class KonqListViewItem : public KonqBaseListViewItem
virtual ~KonqListViewItem();
virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg,
- int column, int width, int alignment );
+ int column, int width, int tqalignment );
virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r );
virtual void updateContents();
virtual void setDisabled( bool disabled );
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 04e56d34b..97bddf559 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -107,7 +107,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
{
kdDebug(1202) << "+KonqBaseListViewWidget" << endl;
- m_dirLister->setMainWindow(topLevelWidget());
+ m_dirLister->setMainWindow(tqtopLevelWidget());
m_bTopLevelComplete = true;
@@ -259,7 +259,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
//search the column in confColumns
for ( unsigned int j = 0; j < NumberOfAtoms; j++ )
{
- if ( confColumns[j].name == *lstColumns.at(i) )
+ if ( confColumns[j].name == *lstColumns.tqat(i) )
{
confColumns[j].displayThisOne = true;
confColumns[j].displayInColumn = currentColumn;
@@ -268,7 +268,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
currentColumn++;
if ( i < lstColumnWidths.count() )
- confColumns[j].width = *lstColumnWidths.at(i);
+ confColumns[j].width = *lstColumnWidths.tqat(i);
else
{
// Default Column widths
@@ -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 );
tqstyle().tqdrawPrimitive( TQStyle::PE_RubberBand, p,
TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
- colorGroup(), TQStyle::Style_Default, colorGroup().base() );
+ tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup().base() );
}
@@ -591,9 +591,9 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
TQRect rect;
if ( allColumnsShowFocus() )
- rect = itemRect( cur );
+ rect = tqitemRect( cur );
else {
- rect = itemRect( cur );
+ rect = tqitemRect( cur );
rect.setWidth( executeArea( cur ) );
}
@@ -623,7 +623,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
setSelected( cur, true );
changed = TRUE;
- rr = rr.unite( itemRect( cur ) );
+ rr = rr.unite( tqitemRect( cur ) );
}
}
else
@@ -631,7 +631,7 @@ 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 ) )
@@ -659,7 +659,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
setSelected( cur, true );
changed = TRUE;
- rr = rr.unite( itemRect( cur ) );
+ rr = rr.unite( tqitemRect( cur ) );
}
}
else
@@ -667,7 +667,7 @@ 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 ) )
@@ -985,7 +985,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
if (_item->pixmap(0) != 0)
{
// Rect of the TQListViewItem'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();
@@ -1192,8 +1192,8 @@ void KonqBaseListViewWidget::setComplete()
if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() )
{
- viewport()->setUpdatesEnabled( true );
- setUpdatesEnabled( true );
+ viewport()->tqsetUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
triggerUpdate();
}
@@ -1237,8 +1237,8 @@ void KonqBaseListViewWidget::slotClear()
m_pBrowserView->resetCount();
m_pBrowserView->lstPendingMimeIconItems().clear();
- viewport()->setUpdatesEnabled( false );
- setUpdatesEnabled( false );
+ viewport()->tqsetUpdatesEnabled( false );
+ tqsetUpdatesEnabled( false );
clear();
}
@@ -1268,8 +1268,8 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries )
if ( !viewport()->isUpdatesEnabled() )
{
- viewport()->setUpdatesEnabled( true );
- setUpdatesEnabled( true );
+ viewport()->tqsetUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
triggerUpdate();
}
slotUpdateBackground();
@@ -1314,8 +1314,8 @@ void KonqBaseListViewWidget::slotDeleteItem( KFileItem * _fileitem )
// OK, but this code also gets activated when deleting a hidden file... (dfaure)
if ( !viewport()->isUpdatesEnabled() )
{
- viewport()->setUpdatesEnabled( true );
- setUpdatesEnabled( true );
+ viewport()->tqsetUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
triggerUpdate();
}
slotUpdateBackground();
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 6224be965..c55996306 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -177,7 +177,7 @@ protected slots:
virtual void slotRedirection( const KURL & );
void slotPopupMenu( TQListViewItem *, const TQPoint&, int );
- // forces a repaint on column size changes / branch expansion
+ // forces a tqrepaint on column size changes / branch expansion
// when there is a background pixmap
void slotUpdateBackground();
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc
index 8e03e171e..0d40ecfce 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cc
@@ -200,7 +200,7 @@ void KonqTextViewItem::updateContents()
};
}
-void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
{
TQColorGroup cg( _cg );
cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]);
@@ -208,7 +208,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
// cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]);
// cg.setColor(TQColorGroup::Highlight, Qt::darkGray);
- KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
+ KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment );
}
/*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r )
diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h
index f091781e2..02a534688 100644
--- a/konqueror/listview/konq_textviewitem.h
+++ b/konqueror/listview/konq_textviewitem.h
@@ -57,7 +57,7 @@ class KonqTextViewItem : public KonqBaseListViewItem
// virtual TQString key( int _column, bool asc) const;
/** Call this before destroying the text view (decreases reference count
* on the view)*/
- virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment );
// virtual void paintFocus( TQPainter *_painter, const TQColorGroup & _cg, const TQRect & r );
virtual void updateContents();
diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc
index 32de25351..3076aa7ac 100644
--- a/konqueror/listview/konq_textviewwidget.cc
+++ b/konqueror/listview/konq_textviewwidget.cc
@@ -101,8 +101,8 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries )
if ( !viewport()->isUpdatesEnabled() )
{
- viewport()->setUpdatesEnabled( true );
- setUpdatesEnabled( true );
+ viewport()->tqsetUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
triggerUpdate();
}
slotUpdateBackground();
@@ -146,8 +146,8 @@ void KonqTextViewWidget::setComplete()
if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() )
{
- viewport()->setUpdatesEnabled( true );
- setUpdatesEnabled( true );
+ viewport()->tqsetUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
triggerUpdate();
}
}
diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc
index 4d04f2fa4..624e74eaf 100644
--- a/konqueror/listview/konq_treeviewwidget.cc
+++ b/konqueror/listview/konq_treeviewwidget.cc
@@ -121,8 +121,8 @@ void KonqTreeViewWidget::slotCompleted( const KURL & _url )
if ( !viewport()->isUpdatesEnabled() )
{
- viewport()->setUpdatesEnabled( true );
- setUpdatesEnabled( true );
+ viewport()->tqsetUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
triggerUpdate();
}
}
@@ -268,8 +268,8 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries )
if ( !viewport()->isUpdatesEnabled() )
{
- viewport()->setUpdatesEnabled( true );
- setUpdatesEnabled( true );
+ viewport()->tqsetUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
triggerUpdate();
}
diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc
index 35b2352e1..014ee769b 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->tdeinitExec( TQString::fromLatin1( "konqueror" ),
- TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
+ if( kapp->tdeinitExec( 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 edaacf1dd..45287eb67 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 1bf45f6a8..e41d1c99a 100644
--- a/konqueror/shellcmdplugin/kshellcmddialog.cpp
+++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp
@@ -18,7 +18,7 @@
*/
#include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <klocale.h>
@@ -43,10 +43,10 @@ KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString&
closeButton= new KPushButton(KStdGuiItem::close(), buttonsBox);
closeButton->setDefault(true);
- label->resize(label->sizeHint());
- m_shell->resize(m_shell->sizeHint());
- closeButton->setFixedSize(closeButton->sizeHint());
- cancelButton->setFixedSize(cancelButton->sizeHint());
+ label->resize(label->tqsizeHint());
+ m_shell->resize(m_shell->tqsizeHint());
+ closeButton->setFixedSize(closeButton->tqsizeHint());
+ cancelButton->setFixedSize(cancelButton->tqsizeHint());
box->addWidget(label,0);
box->addWidget(m_shell,1);
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.h b/konqueror/shellcmdplugin/kshellcmdexecutor.h
index dce2e8cdb..616cdbc13 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.h
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.h
@@ -21,7 +21,7 @@
#define SHELLCOMMANDEXECUTOR_H
#include <tqstring.h>
-#include <textview.h>
+#include <tqtextview.h>
class PtyProcess;
class TQSocketNotifier;
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index 29f8de794..271150338 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -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( parentWidget, this, widgetName ,universalMode, parentWidget->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*)));
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 9cec1df1f..e97c42c3f 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -23,7 +23,7 @@
#include <tqhbox.h>
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqstringlist.h>
#include <tqucomextra_p.h>
@@ -169,7 +169,7 @@ static TQString findFileName(const TQString* tmpl,bool universal, const TQString
void addBackEnd::activatedAddMenu(int id)
{
- kdDebug() << "activatedAddMenu: " << TQString("%1").arg(id) << endl;
+ kdDebug() << "activatedAddMenu: " << TQString("%1").tqarg(id) << endl;
if (((uint)id) == libNames.size())
doRollBack();
if(((uint)id) >= libNames.size())
@@ -178,13 +178,13 @@ void addBackEnd::activatedAddMenu(int id)
KLibLoader *loader = KLibLoader::self();
// try to load the library
- TQString libname = *libNames.at(id);
+ TQString libname = *libNames.tqat(id);
KLibrary *lib = loader->library(TQFile::encodeName(libname));
if (lib)
{
// get the create_ function
TQString factory("add_");
- factory = factory+(*libNames.at(id));
+ factory = factory+(*libNames.tqat(id));
void *add = lib->symbol(TQFile::encodeName(factory));
if (add)
@@ -194,7 +194,7 @@ void addBackEnd::activatedAddMenu(int id)
TQMap<TQString,TQString> map;
func = (bool (*)(TQString*, TQString*, TQMap<TQString,TQString> *)) add;
TQString *tmp = new TQString("");
- if (func(tmp,libParam.at(id),&map))
+ if (func(tmp,libParam.tqat(id),&map))
{
TQString myFile = findFileName(tmp,m_universal,m_currentProfile);
@@ -219,7 +219,7 @@ void addBackEnd::activatedAddMenu(int id)
delete tmp;
}
} else {
- kdWarning() << "libname:" << libNames.at(id)
+ kdWarning() << "libname:" << libNames.tqat(id)
<< " doesn't specify a library!" << endl;
}
}
@@ -252,7 +252,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
m_buttons.setAutoDelete(true);
m_hasStoredUrl = false;
m_latestViewed = -1;
- setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
TQSplitter *splitterWidget = splitter();
if (splitterWidget) {
@@ -262,7 +262,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
}
m_area = new KDockArea(this);
- m_area->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_area->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_mainDockWidget = m_area->createDockWidget("free", 0);
m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget));
m_area->setMainDockWidget(m_mainDockWidget);
@@ -574,7 +574,7 @@ void Sidebar_Widget::activatedMenu(int id)
{
int tmpViewID=m_latestViewed;
for (uint i=0; i<m_buttons.count(); i++) {
- ButtonInfo *button = m_buttons.at(i);
+ ButtonInfo *button = m_buttons.tqat(i);
if ((int) i != tmpViewID)
{
if (button->dock && button->dock->isVisibleTo(this))
@@ -598,7 +598,7 @@ void Sidebar_Widget::activatedMenu(int id)
m_mainDockWidget->show();
if ((tmpLatestViewed>=0) && (tmpLatestViewed < (int) m_buttons.count()))
{
- ButtonInfo *button = m_buttons.at(tmpLatestViewed);
+ ButtonInfo *button = m_buttons.tqat(tmpLatestViewed);
if (button && button->dock)
{
m_noUpdate=true;
@@ -675,7 +675,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;
@@ -694,7 +694,7 @@ void Sidebar_Widget::updateButtons()
{
for (uint i = 0; i < m_buttons.count(); i++)
{
- ButtonInfo *button = m_buttons.at(i);
+ ButtonInfo *button = m_buttons.tqat(i);
if (button->dock)
{
m_noUpdate = true;
@@ -742,7 +742,7 @@ void Sidebar_Widget::createButtons()
for (uint i = 0; i < m_buttons.count(); i++)
{
- ButtonInfo *button = m_buttons.at(i);
+ ButtonInfo *button = m_buttons.tqat(i);
if (m_openViews.contains(button->file))
{
m_buttonBar->setTab(i,true);
@@ -763,7 +763,7 @@ bool Sidebar_Widget::openURL(const class KURL &url)
if (url.protocol()=="sidebar")
{
for (unsigned int i=0;i<m_buttons.count();i++)
- if (m_buttons.at(i)->file==url.path())
+ if (m_buttons.tqat(i)->file==url.path())
{
KMultiTabBarTab *tab = m_buttonBar->tab(i);
if (!tab->isOn())
@@ -778,7 +778,7 @@ bool Sidebar_Widget::openURL(const class KURL &url)
bool ret = false;
for (unsigned int i=0;i<m_buttons.count();i++)
{
- ButtonInfo *button = m_buttons.at(i);
+ ButtonInfo *button = m_buttons.tqat(i);
if (button->dock)
{
if ((button->dock->isVisibleTo(this)) && (button->module))
@@ -845,7 +845,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
{
if (bt==m_buttonBar->tab(i))
{
- m_currentButton = m_buttons.at(i);
+ m_currentButton = m_buttons.tqat(i);
break;
}
}
@@ -953,7 +953,7 @@ bool Sidebar_Widget::createView( ButtonInfo *data)
void Sidebar_Widget::showHidePage(int page)
{
- ButtonInfo *info = m_buttons.at(page);
+ ButtonInfo *info = m_buttons.tqat(page);
if (!info->dock)
{
if (m_buttonBar->isTabRaised(page))
@@ -1049,7 +1049,7 @@ void Sidebar_Widget::collapseExpandSidebar()
if (m_visibleViews.count()==0)
{
m_somethingVisible = false;
- parentWidget()->setMaximumWidth(minimumSizeHint().width());
+ parentWidget()->setMaximumWidth(tqminimumSizeHint().width());
updateGeometry();
emit panelHasBeenExpanded(false);
} else {
@@ -1060,11 +1060,11 @@ void Sidebar_Widget::collapseExpandSidebar()
}
}
-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)
@@ -1072,7 +1072,7 @@ void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid)
kdDebug()<<" Sidebar_Widget::dockWidgetHasUndocked(KDockWidget*)"<<endl;
for (unsigned int i=0;i<m_buttons.count();i++)
{
- ButtonInfo *button = m_buttons.at(i);
+ ButtonInfo *button = m_buttons.tqat(i);
if (button->dock==wid)
{
if (m_buttonBar->isTabRaised(i))
@@ -1195,50 +1195,50 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
void Sidebar_Widget::connectModule(TQObject *mod)
{
- if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) {
+ if (mod->tqmetaObject()->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_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
+ if (mod->tqmetaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,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_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
+ if (mod->tqmetaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,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_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) {
+ if (mod->tqmetaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,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_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) {
+ if (mod->tqmetaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -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 &)));
}
@@ -1255,7 +1255,7 @@ Sidebar_Widget::~Sidebar_Widget()
m_noUpdate = true;
for (uint i=0;i<m_buttons.count();i++)
{
- ButtonInfo *button = m_buttons.at(i);
+ ButtonInfo *button = m_buttons.tqat(i);
if (button->dock)
button->dock->undock();
}
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index 75975f35e..dd7182a35 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);
diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h
index f9ac4bcaa..5c36080fd 100644
--- a/konqueror/sidebar/test/konqsidebartest.h
+++ b/konqueror/sidebar/test/konqsidebartest.h
@@ -18,7 +18,7 @@
#define _konq_sidebar_test_h_
#include <konqsidebarplugin.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
class SidebarTest : public KonqSidebarPlugin
{
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index ce7940517..d1b5cc16e 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -16,7 +16,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqcursor.h>
#include <tqpopupmenu.h>
@@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab()
else
return;
- DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name());
+ DCOPRef ref(kapp->dcopClient()->appId(), tree()->tqtopLevelWidget()->name());
if (bookmark.isGroup()) {
KBookmarkGroup group = bookmark.toGroup();
@@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation()
if ( !bookmark.isGroup() )
{
- kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Selection );
- kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+ kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
TQClipboard::Clipboard );
}
}
@@ -490,7 +490,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
item->setOpen(false);
}
else if ( bk.isSeparator() )
- item->setVisible( false );
+ item->tqsetVisible( false );
else
item->setExpandable( false );
}
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 7be8abbcd..989ef2a70 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -26,7 +26,7 @@
#include <kglobalsettings.h>
#include <kuserprofile.h>
#include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <kio/paste.h>
#include <tqfile.h>
#include <tqpainter.h>
@@ -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
@@ -162,8 +162,8 @@ void KonqSidebarDirTreeItem::itemSelected()
if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() )
bInTrash = true;
- TQMimeSource *data = TQApplication::clipboard()->data();
- bool paste = ( data->encodedData( data->format() ).size() != 0 );
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
+ bool paste = ( data->tqencodedData( data->format() ).size() != 0 );
tree()->enableActions( true, true, paste, true && !bInTrash, true, true );
}
@@ -197,7 +197,7 @@ void KonqSidebarDirTreeItem::paste()
{
// move or not move ?
bool move = false;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
index 050f19424..3a599c7e9 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
@@ -36,7 +36,7 @@ public:
virtual void setOpen( bool open );
- virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment );
virtual bool acceptsDrops( const TQStrList & formats );
virtual void drop( TQDropEvent * ev );
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index ac26b1285..b83926e21 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());
@@ -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 225920387..a90c1c49e 100644
--- a/konqueror/sidebar/trees/history_module/history_dlg.ui
+++ b/konqueror/sidebar/trees/history_module/history_dlg.ui
@@ -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>
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 0d31551f9..02e77c526 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 = TQT_TQDATETIME_OBJECT(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 1c6c7c4c4..0ddc7ae4e 100644
--- a/konqueror/sidebar/trees/history_module/history_item.h
+++ b/konqueror/sidebar/trees/history_module/history_item.h
@@ -60,7 +60,7 @@ public:
static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; }
virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column,
- int width, int alignment );
+ int width, int tqalignment );
private:
const KonqHistoryEntry *m_entry;
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index a7fd943ca..a29a2fe0c 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 )
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 6871415a0..20ca214d4 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -56,8 +56,8 @@ void KonqSidebarHistorySettings::readSettings(bool global)
m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 );
m_valueOlderThan = config->readNumEntry("Value olderThan", 2 );
- TQString minutes = TQString::fromLatin1("minutes");
- TQString days = TQString::fromLatin1("days");
+ TQString minutes = TQString::tqfromLatin1("minutes");
+ TQString days = TQString::tqfromLatin1("days");
TQString metric = config->readEntry("Metric youngerThan", days );
m_metricYoungerThan = (metric == days) ? DAYS : MINUTES;
metric = config->readEntry("Metric olderThan", days );
@@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings()
config->writeEntry("Value youngerThan", m_valueYoungerThan );
config->writeEntry("Value olderThan", m_valueOlderThan );
- TQString minutes = TQString::fromLatin1("minutes");
- TQString days = TQString::fromLatin1("days");
+ TQString minutes = TQString::tqfromLatin1("minutes");
+ TQString days = TQString::tqfromLatin1("days");
config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ?
days : minutes );
config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ?
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index ef2466111..532e3a164 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -22,7 +22,7 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 2eb2c31cd..99c22e148 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -20,7 +20,7 @@
#include "konq_sidebartreemodule.h"
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqcursor.h>
#include <tqdir.h>
#include <tqheader.h>
@@ -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;
@@ -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() );
}
@@ -1031,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation()
{
if (!m_currentTopLevelItem) return;
KURL url = m_currentTopLevelItem->externalURL();
- kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
- kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
+ kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
+ kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
}
///////////////////////////////////////////////////////////////////
@@ -1045,7 +1045,7 @@ void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point )
if ( item ) {
TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText();
if ( !text.isEmpty() )
- tip ( m_view->itemRect( item ), text );
+ tip ( m_view->tqitemRect( item ), text );
}
}
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 2be917f63..70e3d0df0 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -26,7 +26,7 @@
#include <kurldrag.h>
#include <kmimetype.h>
#include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqcursor.h>
#include <konq_drag.h>
@@ -50,7 +50,7 @@ void KonqSidebarTreeTopLevelItem::setOpen( bool open )
void KonqSidebarTreeTopLevelItem::itemSelected()
{
kdDebug() << "KonqSidebarTreeTopLevelItem::itemSelected" << endl;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
bool paste = m_bTopLevelGroup && data->provides("text/uri-list");
tree()->enableActions( true, true, paste, true, true, true /*rename*/ );
}
@@ -157,7 +157,7 @@ void KonqSidebarTreeTopLevelItem::paste()
{
// move or not move ?
bool move = false;
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
if ( data->provides( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 96de18f99..3e18366ab 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -8,7 +8,7 @@
#include <kiconloader.h>
#include <klistviewsearchline.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqdragobject.h>
#include <tqtoolbutton.h>
#include <tqvbox.h>
@@ -76,14 +76,14 @@ void KonqSidebar_Tree::cut()
{
TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L, true );
if (drag)
- TQApplication::clipboard()->setData( drag );
+ TQApplication::tqclipboard()->setData( drag );
}
void KonqSidebar_Tree::copy()
{
TQDragObject * drag = static_cast<KonqSidebarTreeItem*>(tree->selectedItem())->dragObject( 0L );
if (drag)
- TQApplication::clipboard()->setData( drag );
+ TQApplication::tqclipboard()->setData( drag );
}
void KonqSidebar_Tree::paste()
@@ -150,7 +150,7 @@ extern "C"
{
int id=names.findIndex( item );
if (id==-1) return false;
- KSimpleConfig ksc2(*list.at(id));
+ KSimpleConfig ksc2(*list.tqat(id));
ksc2.setGroup("Desktop Entry");
map->insert("Type","Link");
map->insert("Icon",ksc2.readEntry("Icon"));
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h
index 03d473a86..06f6b16b5 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.h
+++ b/konqueror/sidebar/trees/konqsidebar_tree.h
@@ -2,7 +2,7 @@
#define _konq_sidebar_test_h_
#include <konqsidebarplugin.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kparts/part.h>
#include <kparts/factory.h>
#include <kparts/browserextension.h>