From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab. --- konqueror/about/konq_aboutpage.cc | 346 +++++++++++++++++++------------------- konqueror/about/specs.html | 2 +- 2 files changed, 174 insertions(+), 174 deletions(-) (limited to 'konqueror/about') 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 +#include #include #include @@ -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("\n"); + TQString::tqfromLatin1("/\">\n"); TQRegExp reg(""); reg.setCaseSensitive(FALSE); res.replace(reg, "\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( "", 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( "Kubuntu Documentation" ) ) - .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( "Kubuntu Documentation" ) ) + .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. http://www.kde.org) " "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 " - "in the toolbar. ").arg( back_icon_path ) ) - .arg( i18n( "To quickly go to your Home folder press the " - " home button ." ).arg(gohome_icon_path) ) - .arg( i18n( "For more detailed documentation on Konqueror click here." ) - .arg("exec:/khelpcenter") ) - .arg( i18n( "Tuning Tip: 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 ." ).tqarg(gohome_icon_path) ) + .tqarg( i18n( "For more detailed documentation on Konqueror click here." ) + .tqarg("exec:/khelpcenter") ) + .tqarg( i18n( "Tuning Tip: If you want the Konqueror web browser to start faster," " you can turn off this information screen by clicking here. 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( "" ).arg( continue_icon_path ) - .arg( i18n( "Next: Tips & Tricks" ) ) + "Settings -> Save View Profile \"Web Browsing\".").tqarg("config:/disable_overview") ) + .tqarg( "" ).tqarg( continue_icon_path ) + .tqarg( i18n( "Next: Tips & 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 XBEL bookmarks, " - "Konqueror also implements:").arg("http://pyxml.sourceforge.net/topics/xbel/") ) - .arg( i18n("Web Browsing") ) - .arg( i18n("Supported standards") ) - .arg( i18n("Additional requirements*") ) - .arg( i18n("DOM (Level 1, partially Level 2) based " - "HTML 4.01").arg("http://www.w3.org/DOM").arg("http://www.w3.org/TR/html4/") ) - .arg( i18n("built-in") ) - .arg( i18n("Cascading Style Sheets (CSS 1, partially CSS 2)").arg("http://www.w3.org/Style/CSS/") ) - .arg( i18n("built-in") ) - .arg( i18n("ECMA-262 Edition 3 (roughly equals JavaScript 1.5)").arg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") ) - .arg( i18n("JavaScript disabled (globally). Enable JavaScript here.").arg("exec:/kcmshell khtml_java_js") ) - .arg( i18n("JavaScript enabled (globally). Configure JavaScript here.").arg("exec:/kcmshell khtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! - .arg( i18n("Secure Java® support").arg("http://java.sun.com") ) - .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (Blackdown, IBM or Sun)") - .arg("http://www.blackdown.org").arg("http://www.ibm.com").arg("http://java.sun.com") ) - .arg( i18n("Enable Java (globally) here.").arg("exec:/kcmshell khtml_java_js") ) // TODO Maybe test if Java is enabled ? - .arg( i18n("Netscape Communicator® plugins (for viewing Flash®, Real®Audio, Real®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 many more...").arg("exec:/kcmshell ioslaveinfo") ) - .arg( i18n("URL-Completion") ) - .arg( i18n("Manual")) - .arg( i18n("Popup")) - .arg( i18n("(Short-) Automatic")) - .arg( "" ).arg( continue_icon_path ) - .arg( i18n("Return to Starting Points").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("DOM (Level 1, partially Level 2) based " + "HTML 4.01").tqarg("http://www.w3.org/DOM").tqarg("http://www.w3.org/TR/html4/") ) + .tqarg( i18n("built-in") ) + .tqarg( i18n("Cascading Style Sheets (CSS 1, partially CSS 2)").tqarg("http://www.w3.org/Style/CSS/") ) + .tqarg( i18n("built-in") ) + .tqarg( i18n("ECMA-262 Edition 3 (roughly equals JavaScript 1.5)").tqarg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") ) + .tqarg( i18n("JavaScript disabled (globally). Enable JavaScript here.").tqarg("exec:/kcmshell khtml_java_js") ) + .tqarg( i18n("JavaScript enabled (globally). Configure JavaScript here.").tqarg("exec:/kcmshell khtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! + .tqarg( i18n("Secure Java® support").tqarg("http://java.sun.com") ) + .tqarg( i18n("JDK 1.2.0 (Java 2) compatible VM (Blackdown, IBM or Sun)") + .tqarg("http://www.blackdown.org").tqarg("http://www.ibm.com").tqarg("http://java.sun.com") ) + .tqarg( i18n("Enable Java (globally) here.").tqarg("exec:/kcmshell khtml_java_js") ) // TODO Maybe test if Java is enabled ? + .tqarg( i18n("Netscape Communicator® plugins (for viewing Flash®, Real®Audio, Real®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 many more...").tqarg("exec:/kcmshell ioslaveinfo") ) + .tqarg( i18n("URL-Completion") ) + .tqarg( i18n("Manual")) + .tqarg( i18n("Popup")) + .tqarg( i18n("(Short-) Automatic")) + .tqarg( "" ).tqarg( continue_icon_path ) + .tqarg( i18n("Return to Starting Points").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 & 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 & 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 " - "create your own Web-Shortcuts." ).arg("exec:/kcmshell ebrowsing") ) - .arg( i18n( "Use the magnifier button 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 " + "create your own Web-Shortcuts." ).tqarg("exec:/kcmshell ebrowsing") ) + .tqarg( i18n( "Use the magnifier button 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 " " 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 \"Full-Screen Mode\" " + .tqarg( i18n( "You can also find \"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 -> 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 user-agent feature if the website you are visiting " + ", or create your own ones." ).tqarg(view_left_right_icon_path)) + .tqarg( i18n( "Use the user-agent 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 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 proxy 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 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 proxy 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 -> Show " - "Terminal Emulator).").arg(openterm_icon_path)) - .arg( i18n( "Thanks to DCOP you can have full control over Konqueror using a script." -).arg("exec:/kdcop") ) - .arg( i18n( "" ).arg( continue_icon_path ) ) - .arg( i18n( "Next: Specifications" ) ) + "Terminal Emulator).").tqarg(openterm_icon_path)) + .tqarg( i18n( "Thanks to DCOP you can have full control over Konqueror using a script." +).tqarg("exec:/kdcop") ) + .tqarg( i18n( "" ).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("PluginDescriptionFileTypes")) - .arg(i18n("Installed")) - .arg(i18n("Mime TypeDescriptionSuffixesPlugin")); + .tqarg(i18n("Installed Plugins")) + .tqarg(i18n("PluginDescriptionFileTypes")) + .tqarg(i18n("Installed")) + .tqarg(i18n("Mime TypeDescriptionSuffixesPlugin")); 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 @@ %1 - %1 + %1   %1 -- cgit v1.2.3