summaryrefslogtreecommitdiffstats
path: root/tdeui/kxmlguifactory.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
commit56160bf4dfe503631ef6373367b281f081bab2b4 (patch)
tree7fcea2ffd9c3420af999c3dcad0ed032eef93956 /tdeui/kxmlguifactory.cpp
parent13281e2856a2ef43bbab78c5528470309c23aa77 (diff)
downloadtdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz
tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'tdeui/kxmlguifactory.cpp')
-rw-r--r--tdeui/kxmlguifactory.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp
index 11a08fb95..2714b1207 100644
--- a/tdeui/kxmlguifactory.cpp
+++ b/tdeui/kxmlguifactory.cpp
@@ -27,7 +27,7 @@
#include <tqdir.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqwidget.h>
#include <tqdatetime.h>
#include <tqvariant.h>
@@ -110,7 +110,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
xml_file = filename;
else
{
- xml_file = locate("data", TQString::fromLatin1(instance->instanceName() + '/' ) + filename);
+ xml_file = locate("data", TQString::tqfromLatin1(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::fromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" );
+ return TQString::tqfromLatin1( "<!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::fromLatin1( instance->instanceName() + '/' )
+ xml_file = locateLocal("data", TQString::tqfromLatin1( 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::fromLatin1("ActionProperties");
+ const TQString tagActionProp = TQString::tqfromLatin1("ActionProperties");
// first, lets see if we have existing properties
TQDomElement elem;
TQDomNode it = doc.documentElement().firstChild();