3 files changed, 12 insertions, 12 deletions

diff --git a/src/cite/clipboard.cpp b/src/cite/clipboard.cpp
index f242a22..8c91162 100644
--- a/src/cite/clipboard.cpp
+++ b/src/cite/clipboard.cpp
@@ -35,11 +35,11 @@ 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 += '}';
diff --git a/src/cite/lyxpipe.cpp b/src/cite/lyxpipe.cpp
index 4943a8a..6fe3656 100644
--- a/src/cite/lyxpipe.cpp
+++ b/src/cite/lyxpipe.cpp
@@ -44,7 +44,7 @@ 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);
@@ -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/openoffice.cpp b/src/cite/openoffice.cpp
index 3955677..17b0f76 100644
--- a/src/cite/openoffice.cpp
+++ b/src/cite/openoffice.cpp
@@ -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 {