Rename old tq methods that no longer need a unique name

4 files changed, 12 insertions, 12 deletions

diff --git a/lib/store/KoStoreDrag.h b/lib/store/KoStoreDrag.h
index cbd8c40d..e35709e7 100644
--- a/lib/store/KoStoreDrag.h
+++ b/lib/store/KoStoreDrag.h
@@ -27,7 +27,7 @@
  * This allows to drag-n-drop and copy-paste complex koffice objects.
  * As per usual with dragobjects, an instance of KoStoreDrag must be
  * created on the "sending" side (dragging or copying). The "receiving"
- * side (dropping or pasting) only uses provides()/canDecode() and tqencodedData().
+ * side (dropping or pasting) only uses provides()/canDecode() and encodedData().
  *
  * To create the data in memory, create a TQBuffer,
  * then KoStore::createStore( theBuffer, .... ), save the
diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp
index 9da8d2d8..a27bfc41 100644
--- a/lib/store/tests/storedroptest.cpp
+++ b/lib/store/tests/storedroptest.cpp
@@ -88,7 +88,7 @@ bool StoreDropTest::processMimeSource( TQMimeSource* ev )
         formats += fmt;
         bool oasis = TQString( fmt ).startsWith( acceptMimeType );
         if ( oasis || TQString( fmt ) == "application/x-kpresenter" ) {
-            TQByteArray data = ev->tqencodedData( fmt );
+            TQByteArray data = ev->encodedData( fmt );
             showZipContents( data, fmt, oasis );
             return true;
         }
diff --git a/lib/store/tests/xmlwritertest.cpp b/lib/store/tests/xmlwritertest.cpp
index 28bd3b08..e4280cec 100644
--- a/lib/store/tests/xmlwritertest.cpp
+++ b/lib/store/tests/xmlwritertest.cpp
@@ -14,7 +14,7 @@ void speedTest()
     TQString paragText = TQString::fromUtf8( "This is the text of the paragraph. I'm including a euro sign to test encoding issues: €" );
     TQCString styleName = "Heading 1";
 
-    TQFile out( TQString::tqfromLatin1( "out5.xml" ) );
+    TQFile out( TQString::fromLatin1( "out5.xml" ) );
     if ( out.open(IO_WriteOnly) )
     {
         KoXmlWriter writer( &out );
@@ -78,7 +78,7 @@ int main( int argc, char** argv ) {
 
     TEST_BEGIN( 0, 0 );
     writer.startElement( "p", false /*no indent*/ );
-    writer.addTextSpan( TQString::tqfromLatin1( "   \t\n foo  " ) );
+    writer.addTextSpan( TQString::fromLatin1( "   \t\n foo  " ) );
     writer.endElement();
     TEST_END( "textspan test", "<r>\n"
               " <p><text:s text:c=\"3\"/><text:tab/><text:line-break/> foo<text:s text:c=\"2\"/></p>\n"
@@ -97,14 +97,14 @@ int main( int argc, char** argv ) {
     TEST_BEGIN( 0, 0 );
     writer.startElement( "p", false /*no indent*/ );
     writer.addProcessingInstruction( "opendocument foobar" );
-    writer.addTextSpan( TQString::tqfromLatin1( "foo" ) );
+    writer.addTextSpan( TQString::fromLatin1( "foo" ) );
     writer.endElement();
     TEST_END( "processinginstruction test", "<r>\n"
               " <p><?opendocument foobar?>foo</p>\n"
               "</r>\n" );
 
     TEST_BEGIN( 0, 0 );
-    writer.addManifestEntry( TQString::tqfromLatin1( "foo/bar/blah" ), TQString::tqfromLatin1( "mime/type" ) );
+    writer.addManifestEntry( TQString::fromLatin1( "foo/bar/blah" ), TQString::fromLatin1( "mime/type" ) );
     TEST_END( "addManifestEntry", "<r>\n <manifest:file-entry manifest:media-type=\"mime/type\" manifest:full-path=\"foo/bar/blah\"/>\n</r>\n" );
 
     int sz = 15000;  // must be more than KoXmlWriter::s_escapeBufferLen
@@ -119,7 +119,7 @@ int main( int argc, char** argv ) {
 
     TQString longPath;
     for ( uint i = 0 ; i < 1000 ; ++i )
-        longPath += TQString::tqfromLatin1( "M10 10L20 20 " );
+        longPath += TQString::fromLatin1( "M10 10L20 20 " );
     expected = "<r a=\"";
     expected += longPath.utf8() + "\"/>\n";
     TEST_BEGIN( 0, 0 );
@@ -131,9 +131,9 @@ int main( int argc, char** argv ) {
     bool val = true;
     int num = 1;
     double numdouble = 5.0;
-    writer.addConfigItem( TQString::tqfromLatin1( "TestConfigBool" ), val );
-    writer.addConfigItem( TQString::tqfromLatin1( "TestConfigInt" ), num );
-    writer.addConfigItem( TQString::tqfromLatin1( "TestConfigDouble" ), numdouble );
+    writer.addConfigItem( TQString::fromLatin1( "TestConfigBool" ), val );
+    writer.addConfigItem( TQString::fromLatin1( "TestConfigInt" ), num );
+    writer.addConfigItem( TQString::fromLatin1( "TestConfigDouble" ), numdouble );
     TEST_END( "test config", "<r>\n"
                              " <config:config-item config:name=\"TestConfigBool\" config:type=\"boolean\">true</config:config-item>\n"
                              " <config:config-item config:name=\"TestConfigInt\" config:type=\"int\">1</config:config-item>\n"
diff --git a/lib/store/tests/xmlwritertest.h b/lib/store/tests/xmlwritertest.h
index cdafe8a5..12011c03 100644
--- a/lib/store/tests/xmlwritertest.h
+++ b/lib/store/tests/xmlwritertest.h
@@ -34,8 +34,8 @@
             TQCString s2 = expectedFull; \
             if ( s1.length() != s2.length() ) \
                 qDebug( "got length %d, expected %d", s1.length(), s2.length() ); \
-            s1.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \
-            s2.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \
+            s1.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \
+            s2.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \
             qDebug( "%s", s1.data() ); \
             qDebug( "Expected:\n%s", s2.data() ); \
             return 1; /*exit*/ \