1 files changed, 18 insertions, 18 deletions

diff --git a/src/entryeditdialog.cpp b/src/entryeditdialog.cpp
index 70b2288..7935444 100644
--- a/src/entryeditdialog.cpp
+++ b/src/entryeditdialog.cpp
@@ -73,12 +73,12 @@ EntryEditDialog::EntryEditDialog(TQWidget* parent_, const char* name_)
   connect(this, TQT_SIGNAL(user3Clicked()), TQT_SLOT(slotGoPrevEntry()));
 
   KGuiItem prev;
-  prev.setIconName(TQString::tqfromLatin1(TQApplication::reverseLayout() ? "forward" : "back"));
+  prev.setIconName(TQString::fromLatin1(TQApplication::reverseLayout() ? "forward" : "back"));
   prev.setToolTip(i18n("Go to the previous entry in the collection"));
   prev.setWhatsThis(prev.toolTip());
 
   KGuiItem next;
-  next.setIconName(TQString::tqfromLatin1(TQApplication::reverseLayout() ? "back" : "forward"));
+  next.setIconName(TQString::fromLatin1(TQApplication::reverseLayout() ? "back" : "forward"));
   next.setToolTip(i18n("Go to the next entry in the collection"));
   next.setWhatsThis(next.toolTip());
 
@@ -86,14 +86,14 @@ EntryEditDialog::EntryEditDialog(TQWidget* parent_, const char* name_)
   setButtonGuiItem(m_prevBtn, prev);
 
   KAccel* accel = new KAccel(this);
-  accel->insert(TQString::tqfromLatin1("Go Prev"), TQString(), prev.toolTip(), TQt::Key_PageUp,
+  accel->insert(TQString::fromLatin1("Go Prev"), TQString(), prev.toolTip(), TQt::Key_PageUp,
                 Controller::self(), TQT_SLOT(slotGoPrevEntry()));
-  accel->insert(TQString::tqfromLatin1("Go Next"), TQString(), next.toolTip(), TQt::Key_PageDown,
+  accel->insert(TQString::fromLatin1("Go Next"), TQString(), next.toolTip(), TQt::Key_PageDown,
                 Controller::self(), TQT_SLOT(slotGoNextEntry()));
 
-  setHelp(TQString::tqfromLatin1("entry-editor"));
+  setHelp(TQString::fromLatin1("entry-editor"));
 
-  resize(configDialogSize(TQString::tqfromLatin1("Edit Dialog Options")));
+  resize(configDialogSize(TQString::fromLatin1("Edit Dialog Options")));
 }
 
 void EntryEditDialog::slotClose() {
@@ -213,7 +213,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
       }
       widget->updateGeometry();
       if(!field->isSingleCategory()) {
-        maxHeight = TQMAX(maxHeight, widget->tqminimumSizeHint().height());
+        maxHeight = TQMAX(maxHeight, widget->minimumSizeHint().height());
       }
       ++count;
     }
@@ -248,19 +248,19 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
       l->addRowSpacing(row, maxHeight);
     }
     // I don't want anything to be hidden, Keramik has a bug if I don't do this
-    it.current()->setMinimumHeight(it.current()->tqsizeHint().height());
+    it.current()->setMinimumHeight(it.current()->sizeHint().height());
     // the parent of the grid is the page that got added to the tabs
     it.current()->parentWidget()->tqlayout()->tqinvalidate();
-    it.current()->parentWidget()->setMinimumHeight(it.current()->parentWidget()->tqsizeHint().height());
+    it.current()->parentWidget()->setMinimumHeight(it.current()->parentWidget()->sizeHint().height());
   }
 
   setUpdatesEnabled(true);
 // this doesn't seem to work
-//  tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
+//  setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
 // so do this instead
-  tqlayout()->tqinvalidate(); // needed so the tqsizeHint() gets recalculated
-  m_tabs->setMinimumHeight(m_tabs->tqminimumSizeHint().height());
-  m_tabs->setMinimumWidth(m_tabs->tqsizeHint().width());
+  tqlayout()->tqinvalidate(); // needed so the sizeHint() gets recalculated
+  m_tabs->setMinimumHeight(m_tabs->minimumSizeHint().height());
+  m_tabs->setMinimumWidth(m_tabs->sizeHint().width());
 
   // update keyboard accels
   // only want to manage tabBar()
@@ -313,7 +313,7 @@ void EntryEditDialog::slotHandleSave() {
       names += entry->title();
     }
     TQString str(i18n("Do you really want to modify these entries?"));
-    TQString dontAsk = TQString::tqfromLatin1("SaveMultipleBooks"); // don't change 'books', invisible anyway
+    TQString dontAsk = TQString::fromLatin1("SaveMultipleBooks"); // don't change 'books', invisible anyway
     int ret = KMessageBox::questionYesNoList(this, str, names, i18n("Modify Multiple Entries"),
                                              KStdGuiItem::yes(), KStdGuiItem::no(), dontAsk);
     if(ret != KMessageBox::Yes) {
@@ -345,7 +345,7 @@ void EntryEditDialog::slotHandleSave() {
         }
         entry->setField(fIt, temp);
         if(temp.isEmpty()) {
-          TQString prop = fIt->property(TQString::tqfromLatin1("required")).lower();
+          TQString prop = fIt->property(TQString::fromLatin1("required")).lower();
           if(prop == Latin1Literal("1") || prop == Latin1Literal("true")) {
             fieldsRequiringValues.append(fIt.data());
           }
@@ -361,7 +361,7 @@ void EntryEditDialog::slotHandleSave() {
     for(Data::FieldVecIt it = fieldsRequiringValues.begin(); it != fieldsRequiringValues.end(); ++it) {
       titles << it->title();
     }
-    TQString dontAsk = TQString::tqfromLatin1("SaveWithoutRequired");
+    TQString dontAsk = TQString::fromLatin1("SaveWithoutRequired");
     int ret = KMessageBox::questionYesNoList(this, str, titles, i18n("Modify Entries"),
                                              KStdGuiItem::yes(), KStdGuiItem::no(), dontAsk);
     if(ret != KMessageBox::Yes) {
@@ -379,7 +379,7 @@ void EntryEditDialog::slotHandleSave() {
       Kernel::self()->modifyEntries(oldEntries, m_currEntries);
     }
     if(!m_currEntries.isEmpty() && !m_currEntries[0]->title().isEmpty()) {
-      setCaption(i18n("Edit Entry") + TQString::tqfromLatin1(" - ") + m_currEntries[0]->title());
+      setCaption(i18n("Edit Entry") + TQString::fromLatin1(" - ") + m_currEntries[0]->title());
     }
   }
 
@@ -509,7 +509,7 @@ void EntryEditDialog::setContents(Data::EntryPtr entry_) {
   m_currEntries.append(entry_);
 
   if(!entry_->title().isEmpty()) {
-    setCaption(i18n("Edit Entry") + TQString::tqfromLatin1(" - ") + entry_->title());
+    setCaption(i18n("Edit Entry") + TQString::fromLatin1(" - ") + entry_->title());
   }
 
   if(m_currColl != entry_->collection()) {