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

4 files changed, 18 insertions, 18 deletions

diff --git a/src/cite/clipboard.cpp b/src/cite/clipboard.cpp
index f242a22..9be7fd0 100644
--- a/src/cite/clipboard.cpp
+++ b/src/cite/clipboard.cpp
@@ -18,7 +18,7 @@
 #include <klocale.h>
 
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 using Tellico::Cite::Clipboard;
 
@@ -35,16 +35,16 @@ bool Clipboard::cite(Data::EntryVec entries_) {
     return false;
   }
 
-  TQString s = TQString::tqfromLatin1("\\cite{");
+  TQString s = TQString::fromLatin1("\\cite{");
   for(Data::EntryVecIt it = entries_.begin(); it != entries_.end(); ++it) {
     s += BibtexHandler::bibtexKey(it.data());
     if(!it.nextEnd()) {
-      s += TQString::tqfromLatin1(", ");
+      s += TQString::fromLatin1(", ");
     }
   }
   s += '}';
 
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   cb->setText(s, TQClipboard::Clipboard);
   return true;
 }
diff --git a/src/cite/lyxpipe.cpp b/src/cite/lyxpipe.cpp
index 4943a8a..4b305d1 100644
--- a/src/cite/lyxpipe.cpp
+++ b/src/cite/lyxpipe.cpp
@@ -44,10 +44,10 @@ bool Lyxpipe::cite(Data::EntryVec entries_) {
   }
 
   TQString lyxpipe = Config::lyxpipe();
-  lyxpipe += TQString::tqfromLatin1(".in");
+  lyxpipe += TQString::fromLatin1(".in");
 //  myDebug() << "Lyxpipe::cite() - " << lyxpipe << endl;
 
-  TQString errorStr = i18n("<qt>Tellico is unable to write to the server pipe at <b>%1</b>.</qt>").tqarg(lyxpipe);
+  TQString errorStr = i18n("<qt>Tellico is unable to write to the server pipe at <b>%1</b>.</qt>").arg(lyxpipe);
 
   TQFile file(lyxpipe);
   if(!file.exists()) {
@@ -72,7 +72,7 @@ bool Lyxpipe::cite(Data::EntryVec entries_) {
     output += s;
     if(!it.nextEnd() && !output.isEmpty()) {
       // pybliographer uses comma-space, and pyblink expects the space there
-      output += TQString::tqfromLatin1(", ");
+      output += TQString::fromLatin1(", ");
     }
   }
   if(output.isEmpty()) {
diff --git a/src/cite/ooo/ooohandler.cpp b/src/cite/ooo/ooohandler.cpp
index d36b3e4..6af495c 100644
--- a/src/cite/ooo/ooohandler.cpp
+++ b/src/cite/ooo/ooohandler.cpp
@@ -50,12 +50,12 @@ rtl::OUString OOOHandler::TQString2OU(const TQString& str) {
   const uint len = str.length();
   sal_Unicode* uni = new sal_Unicode[len + 1];
 
-  const TQChar* qPtr = str.tqunicode();
+  const TQChar* qPtr = str.unicode();
   const TQChar* qEnd = qPtr + len;
   sal_Unicode* uPtr = uni;
 
   while (qPtr != qEnd) {
-    *(uPtr++) = (*(qPtr++)).tqunicode();
+    *(uPtr++) = (*(qPtr++)).unicode();
   }
 
   *uPtr = 0;
diff --git a/src/cite/openoffice.cpp b/src/cite/openoffice.cpp
index 3955677..4712e95 100644
--- a/src/cite/openoffice.cpp
+++ b/src/cite/openoffice.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 
 #include <tqiconset.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 #include <tqfile.h>
@@ -43,7 +43,7 @@ class OpenOffice::Private {
   friend class OpenOffice;
 
   Private() : handler(0), port(-1) {
-    KLibrary* library = Tellico::openLibrary(TQString::tqfromLatin1("tellico_ooo"));
+    KLibrary* library = Tellico::openLibrary(TQString::fromLatin1("tellico_ooo"));
     if(library) {
       void* func = library->symbol("handler");
       if(func) {
@@ -79,11 +79,11 @@ bool OpenOffice::connect() {
     return false;
   }
 
-  StatusBar::self()->settqStatus(i18n("Connecting to OpenOffice.org..."));
+  StatusBar::self()->setStatus(i18n("Connecting to OpenOffice.org..."));
 
   if(d->port == -1) {
     KConfigGroup config(kapp->config(), "OpenOffice.org");
-    d->host = config.readEntry("Host", TQString::tqfromLatin1("localhost"));
+    d->host = config.readEntry("Host", TQString::fromLatin1("localhost"));
     d->port = config.readNumEntry("Port", 2083);
     d->pipe = config.readPathEntry("Pipe");
     // the ooohandler will depend on pipe.isEmpty() to indicate the port should be used
@@ -116,7 +116,7 @@ bool OpenOffice::connect() {
         break;
     }
   }
-  StatusBar::self()->cleartqStatus();
+  StatusBar::self()->clearStatus();
   return success;
 }
 
@@ -136,7 +136,7 @@ bool OpenOffice::cite(Data::EntryVec entries_) {
     return false;
   }
 
-  const TQString bibtex = TQString::tqfromLatin1("bibtex");
+  const TQString bibtex = TQString::fromLatin1("bibtex");
   Data::FieldVec vec = coll->fields();
   for(Data::EntryVecIt entry = entries_.begin(); entry != entries_.end(); ++entry) {
     Cite::Map values;
@@ -165,7 +165,7 @@ bool OpenOffice::connectionDialog() {
                   true, i18n("OpenOffice.org Connection"),
                   KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help);
 
-  dlg.setHelp(TQString::tqfromLatin1("openoffice-org"));
+  dlg.setHelp(TQString::fromLatin1("openoffice-org"));
 
   TQWidget* widget = new TQWidget(&dlg);
   TQBoxLayout* topLayout = new TQVBoxLayout(widget, KDialog::spacingHint());
@@ -173,7 +173,7 @@ bool OpenOffice::connectionDialog() {
   // is there a better way to do a multi-line label than to insert newlines in the text?
   TQBoxLayout* blay = new TQHBoxLayout(topLayout);
   TQLabel* l = new TQLabel(widget);
-  l->setPixmap(DesktopIcon(TQString::tqfromLatin1("ooo_writer"), 64));
+  l->setPixmap(DesktopIcon(TQString::fromLatin1("ooo_writer"), 64));
   blay->addWidget(l);
   l = new TQLabel(widget);
   l->setText(i18n("Tellico was unable to connect to OpenOffice.org. "
@@ -235,7 +235,7 @@ bool OpenOffice::connectionDialog() {
   if(radioTCP->isChecked()) {
     h = hostEdit->text();
     if(h.isEmpty()) {
-      h = TQString::tqfromLatin1("localhost");
+      h = TQString::fromLatin1("localhost");
     }
     p = portSpin->value();
   } else {