Rename old tq methods that no longer need a unique name

4 files changed, 11 insertions, 11 deletions

diff --git a/kipi-plugins/calendar/caleventsbase.ui b/kipi-plugins/calendar/caleventsbase.ui
index d9aa2cb..80dff76 100644
--- a/kipi-plugins/calendar/caleventsbase.ui
+++ b/kipi-plugins/calendar/caleventsbase.ui
@@ -44,7 +44,7 @@
                     <property name="name">
                         <cstring>ohFileEdit</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>300</width>
                             <height>0</height>
@@ -120,7 +120,7 @@ This is fully optional. All the events from this calendar will be printed red.</
                     <property name="name">
                         <cstring>fhFileEdit</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>300</width>
                             <height>0</height>
@@ -175,7 +175,7 @@ This is fully optional. All the events from this calendar will be printed green.
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>140</height>
diff --git a/kipi-plugins/calendar/calselect.cpp b/kipi-plugins/calendar/calselect.cpp
index c29809a..f7479db 100644
--- a/kipi-plugins/calendar/calselect.cpp
+++ b/kipi-plugins/calendar/calselect.cpp
@@ -74,7 +74,7 @@ void CalSelect::setupView( KIPI::Interface* interface )
     yearSpin_ = new TQSpinBox(KGlobal::locale()->calendar()->minValidYear(),
                              KGlobal::locale()->calendar()->maxValidYear(),
                              1,yearBox);
-    yearSpin_->setValue(KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()));
+    yearSpin_->setValue(KGlobal::locale()->calendar()->year(TQDate::currentDate()));
     slotYearChanged(yearSpin_->value());
 
     connect(yearSpin_, TQT_SIGNAL(valueChanged(int)),
@@ -90,7 +90,7 @@ void CalSelect::setupView( KIPI::Interface* interface )
     monthBox->tqlayout()->setMargin( 11 );
 
     monthBoxLayout_ = new TQGridLayout(monthBox->tqlayout());
-    monthBoxLayout_->tqsetAlignment( TQt::AlignCenter );
+    monthBoxLayout_->setAlignment( TQt::AlignCenter );
 
     KURL::List urlList;
     KIPI::ImageCollection images = interface->currentSelection();
diff --git a/kipi-plugins/calendar/calwidget.cpp b/kipi-plugins/calendar/calwidget.cpp
index 235fb0f..9f40e39 100644
--- a/kipi-plugins/calendar/calwidget.cpp
+++ b/kipi-plugins/calendar/calwidget.cpp
@@ -48,7 +48,7 @@ namespace KIPICalendarPlugin
 CalWidget::CalWidget(TQWidget *parent)
     : TQWidget(parent,0,TQt::WRepaintNoErase|TQt::WResizeNoErase)
 {
-    tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     calPainter_ = 0;
     pix_ = new TQPixmap();
 }
@@ -78,8 +78,8 @@ void CalWidget::recreate()
     if (!calPainter_)
         calPainter_ = new CalPainter(TQT_TQPAINTDEVICE(pix_));
 
-    calPainter_->setYearMonth(KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()),
-                              KGlobal::locale()->calendar()->month(TQDate::tqcurrentDate()));
+    calPainter_->setYearMonth(KGlobal::locale()->calendar()->year(TQDate::currentDate()),
+                              KGlobal::locale()->calendar()->month(TQDate::currentDate()));
     calPainter_->paint();
     update();
 }
diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp
index 0ffc1a9..935ae87 100644
--- a/kipi-plugins/calendar/calwizard.cpp
+++ b/kipi-plugins/calendar/calwizard.cpp
@@ -215,9 +215,9 @@ void CalWizard::slotPageSelected(const TQString&)
             TQString year = TQString::number(cSettings_->getYear());
 
             TQString extra;
-            if ((KGlobal::locale()->calendar()->month(TQDate::tqcurrentDate()) >= 6 &&
-                 KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()) == cSettings_->getYear()) ||
-                KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()) > cSettings_->getYear())
+            if ((KGlobal::locale()->calendar()->month(TQDate::currentDate()) >= 6 &&
+                 KGlobal::locale()->calendar()->year(TQDate::currentDate()) == cSettings_->getYear()) ||
+                KGlobal::locale()->calendar()->year(TQDate::currentDate()) > cSettings_->getYear())
                 extra = "<br><br><b>"+i18n("Please note that you are making a "
                         "calendar for<br>the current year or a year in the "
                         "past.")+"</b>";