Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 882bcd26b3d60be72ea2b35921969a9850c52db9.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/notefactory.cpp b/src/notefactory.cpp
index 7e7e0d5..1b8e83e 100644
--- a/src/notefactory.cpp
+++ b/src/notefactory.cpp
@@ -25,7 +25,7 @@
 #include <tqregexp.h>
 #include <kcolordrag.h>
 #include <kurldrag.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqdir.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
@@ -36,7 +36,7 @@
 #include <tqfile.h>
 #include <kfilemetainfo.h>
 #include <kio/jobclasses.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <kopenwith.h>
 #include <kfiledialog.h>
 #include <kicondialog.h>
@@ -264,7 +264,7 @@ TQString NoteFactory::createNoteLauncherFile(const TQString &command, const TQSt
 			"Name=%2\n"
 			"Icon=%3\n"
 			"Encoding=UTF-8\n"
-			"Type=Application\n").arg(command, name, icon.isEmpty() ? TQString("exec") : icon);
+			"Type=Application\n").tqarg(command, name, icon.isEmpty() ? TQString("exec") : icon);
 	TQString fileName = fileNameForNewNote(parent, "launcher.desktop");
 	TQString fullPath = parent->fullPathForFileName(fileName);
 //	parent->dontCareOfCreation(fullPath);
@@ -399,7 +399,7 @@ Note* NoteFactory::dropNote(TQMimeSource *source, Basket *parent, bool fromDrop,
 	*/
 	if (source->provides("text/x-moz-url")) { // FOR MOZILLA
 		// Get the array and create a TQChar array of 1/2 of the size
-		TQByteArray mozilla = source->encodedData("text/x-moz-url");
+		TQByteArray mozilla = source->tqencodedData("text/x-moz-url");
 		TQMemArray<TQChar> chars( mozilla.count() / 2 );
 		// A small debug work to know the value of each bytes
 		if (Global::debugWindow)
@@ -445,7 +445,7 @@ Note* NoteFactory::dropNote(TQMimeSource *source, Basket *parent, bool fromDrop,
 	TQString message = i18n("<p>%1 doesn't support the data you've dropped.<br>"
 			"It however created a generic note, allowing you to drag or copy it to an application that understand it.</p>"
 			"<p>If you want the support of these data, please contact developer or visit the "
-			"<a href=\"http://basket.kde.org/dropdb.php\">BasKet Drop Database</a>.</p>").arg(kapp->aboutData()->programName());
+			"<a href=\"http://basket.kde.org/dropdb.php\">BasKet Drop Database</a>.</p>").tqarg(kapp->aboutData()->programName());
 	KMessageBox::information(parent, message, i18n("Unsupported MIME Type(s)"),
 							 "unsupportedDropInfo", KMessageBox::AllowLink);
 	return note;
@@ -471,7 +471,7 @@ Note* NoteFactory::createNoteUnknown(TQMimeSource *source, Basket *parent/*, con
 	// Echo the length (in bytes) and then the data, and then same for next MIME type:
 	for (int i = 0; source->format(i); ++i)
 		if ( *(source->format(i)) ) {
-		TQByteArray data = source->encodedData(source->format(i));
+		TQByteArray data = source->tqencodedData(source->format(i));
 		stream << (TQ_UINT32)data.count();
 		stream.writeRawBytes(data.data(), data.count());
 		}
@@ -682,7 +682,7 @@ Note* NoteFactory::copyFileAndLoad(const KURL &url, Basket *parent)
 	if (Global::debugWindow)
 		*Global::debugWindow << "copyFileAndLoad: " + url.prettyURL() + " to " + fullPath;
 
-//	TQString annotations = i18n("Original file: %1").arg(url.prettyURL());
+//	TQString annotations = i18n("Original file: %1").tqarg(url.prettyURL());
 //	parent->dontCareOfCreation(fullPath);
 
 
@@ -710,7 +710,7 @@ Note* NoteFactory::moveFileAndLoad(const KURL &url, Basket *parent)
 	if (Global::debugWindow)
 		*Global::debugWindow << "moveFileAndLoad: " + url.prettyURL() + " to " + fullPath;
 
-//	TQString annotations = i18n("Original file: %1").arg(url.prettyURL());
+//	TQString annotations = i18n("Original file: %1").tqarg(url.prettyURL());
 //	parent->dontCareOfCreation(fullPath);
 
 
@@ -779,7 +779,7 @@ NoteType::Id NoteFactory::typeForURL(const KURL &url, Basket */*parent*/)
 	if (metaInfo.isEmpty()) { // metaInfo is empty for GIF files on my machine !
 		if      (viewText  && maybeText(url))             return NoteType::Text;
 		else if (viewHTML  && (maybeHtml(url)))           return NoteType::Html;
-		else if (viewImage && maybeAnimation(url))        return NoteType::Animation; // See Note::movieStatus(int)
+		else if (viewImage && maybeAnimation(url))        return NoteType::Animation; // See Note::movietqStatus(int)
 		else if (viewImage && maybeImageOrAnimation(url)) return NoteType::Image;     //  for more explanations
 		else if (viewSound && maybeSound(url))            return NoteType::Sound;
 		else if (maybeLauncher(url))                      return NoteType::Launcher;