summaryrefslogtreecommitdiffstats
path: root/kdeui/kxmlguifactory.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:32:40 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-02 19:04:52 +0200
commite2867c1f1eec514d56386f2fc5350eaaf760532a (patch)
tree4803ad36a38c00b3ff22af6763e86d92a60629ee /kdeui/kxmlguifactory.cpp
parent4418657ced76d97d20c3a4aeb79fefccdbd6ad7b (diff)
downloadtdelibs-e2867c1f1eec514d56386f2fc5350eaaf760532a.tar.gz
tdelibs-e2867c1f1eec514d56386f2fc5350eaaf760532a.zip
Rename old tq methods that no longer need a unique name
(cherry picked from commit 984c25aa6969e55896e9a13c8e7f7b8a58991a4e)
Diffstat (limited to 'kdeui/kxmlguifactory.cpp')
-rw-r--r--kdeui/kxmlguifactory.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kdeui/kxmlguifactory.cpp b/kdeui/kxmlguifactory.cpp
index 2714b1207..a8c437571 100644
--- a/kdeui/kxmlguifactory.cpp
+++ b/kdeui/kxmlguifactory.cpp
@@ -110,7 +110,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
xml_file = filename;
else
{
- xml_file = locate("data", TQString::tqfromLatin1(instance->instanceName() + '/' ) + filename);
+ xml_file = locate("data", TQString::fromLatin1(instance->instanceName() + '/' ) + filename);
if ( !TQFile::exists( xml_file ) )
xml_file = locate( "data", filename );
}
@@ -120,7 +120,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
{
kdError(240) << "No such XML file " << filename << endl;
if ( never_null )
- return TQString::tqfromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" );
+ return TQString::fromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" );
else
return TQString::null;
}
@@ -146,7 +146,7 @@ bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc,
TQString xml_file(filename);
if (TQDir::isRelativePath(xml_file))
- xml_file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' )
+ xml_file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' )
+ filename);
TQFile file( xml_file );
@@ -566,7 +566,7 @@ int KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts , bool bSaveSe
TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc )
{
- const TQString tagActionProp = TQString::tqfromLatin1("ActionProperties");
+ const TQString tagActionProp = TQString::fromLatin1("ActionProperties");
// first, lets see if we have existing properties
TQDomElement elem;
TQDomNode it = doc.documentElement().firstChild();