summaryrefslogtreecommitdiffstats
path: root/korganizer/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
commit9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch)
treeab537a329b9613e11dce8195761f93ffe82aed24 /korganizer/plugins
parent3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff)
downloadtdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz
tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'korganizer/plugins')
-rw-r--r--korganizer/plugins/datenums/configdialog.cpp2
-rw-r--r--korganizer/plugins/datenums/datenums.cpp4
-rw-r--r--korganizer/plugins/exchange/exchange.cpp6
-rw-r--r--korganizer/plugins/exchange/exchangeconfig.cpp2
-rw-r--r--korganizer/plugins/exchange/exchangedialog.cpp2
-rw-r--r--korganizer/plugins/hebrew/configdialog.cpp2
-rw-r--r--korganizer/plugins/hebrew/hebrew.cpp4
-rw-r--r--korganizer/plugins/printing/journal/calprintjournalconfig_base.ui8
-rw-r--r--korganizer/plugins/printing/list/calprintlistconfig_base.ui8
-rw-r--r--korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui8
-rw-r--r--korganizer/plugins/printing/year/calprintyearconfig_base.ui6
-rw-r--r--korganizer/plugins/printing/year/yearprint.cpp4
-rw-r--r--korganizer/plugins/projectview/koprojectview.cpp16
-rw-r--r--korganizer/plugins/projectview/koprojectview.h2
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.cpp4
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.h2
-rw-r--r--korganizer/plugins/timespanview/timespanwidget.cpp2
17 files changed, 41 insertions, 41 deletions
diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp
index bf524e466..3766e2ffd 100644
--- a/korganizer/plugins/datenums/configdialog.cpp
+++ b/korganizer/plugins/datenums/configdialog.cpp
@@ -18,7 +18,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqvbuttongroup.h>
#include <tqradiobutton.h>
diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp
index af022837e..b0a25ce4a 100644
--- a/korganizer/plugins/datenums/datenums.cpp
+++ b/korganizer/plugins/datenums/datenums.cpp
@@ -56,8 +56,8 @@ TQString Datenums::shortText(const TQDate &date)
return TQString::number( KOGlobals::self()->calendarSystem()->daysInYear(date) - doy );
break;
case 2: // both day of year and days till end of year
- return i18n("dayOfYear / daysTillEndOfYear", "%1 / %2").arg( doy )
- .arg(KOGlobals::self()->calendarSystem()->daysInYear(date) - doy);
+ return i18n("dayOfYear / daysTillEndOfYear", "%1 / %2").tqarg( doy )
+ .tqarg(KOGlobals::self()->calendarSystem()->daysInYear(date) - doy);
break;
case 0: // only day of year
default:
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index a0062387c..87784c282 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -65,7 +65,7 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
mAccount = new KPIM::ExchangeAccount( "Calendar/Exchange Plugin" );
mClient = new KPIM::ExchangeClient( mAccount );
- mClient->setWindow( parent->topLevelWidget() );
+ mClient->setWindow( parent->tqtopLevelWidget() );
setXMLFile("plugins/exchangeui.rc");
@@ -219,9 +219,9 @@ void Exchange::showError( int error, const TQString& moreInfo /* = TQString() */
if ( error != KPIM::ExchangeClient::ResultOK ) {
if ( moreInfo.isNull() )
- KMessageBox::error( mainWindow()->topLevelWidget(), errorText, i18n( "Exchange Plugin" ) );
+ KMessageBox::error( mainWindow()->tqtopLevelWidget(), errorText, i18n( "Exchange Plugin" ) );
else
- KMessageBox::detailedError( mainWindow()->topLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) );
+ KMessageBox::detailedError( mainWindow()->tqtopLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) );
}
}
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index 1f2c42014..fe01324ac 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqcombobox.h>
diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp
index 229333956..de56a3a19 100644
--- a/korganizer/plugins/exchange/exchangedialog.cpp
+++ b/korganizer/plugins/exchange/exchangedialog.cpp
@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqcombobox.h>
diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp
index fbd82c68c..6298151ac 100644
--- a/korganizer/plugins/hebrew/configdialog.cpp
+++ b/korganizer/plugins/hebrew/configdialog.cpp
@@ -19,7 +19,7 @@
#include "configdialog.h"
#include "configdialog.moc"
#include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <kglobal.h>
#include <kconfig.h>
diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp
index 8a9f37bd4..e36925aa5 100644
--- a/korganizer/plugins/hebrew/hebrew.cpp
+++ b/korganizer/plugins/hebrew/hebrew.cpp
@@ -81,8 +81,8 @@ TQString Hebrew::shortText(const TQDate & date)
hebrew_day_number, hebrew_year);
KCalendarSystem *cal = KCalendarSystemFactory::create("hebrew");
- label_text = TQString("%1 %2").arg(cal->dayString(date, false))
- .arg(cal->monthName(date));
+ label_text = TQString("%1 %2").tqarg(cal->dayString(date, false))
+ .tqarg(cal->monthName(date));
if (holidays.count())
{
diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
index 6868729b5..1ef0c311b 100644
--- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
+++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
@@ -65,7 +65,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>15</width>
<height>20</height>
@@ -136,7 +136,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>324</width>
<height>21</height>
@@ -157,7 +157,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>201</height>
diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
index 249531df0..b27389b6c 100644
--- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui
+++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
@@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>15</width>
<height>20</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>324</width>
<height>21</height>
@@ -169,7 +169,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>40</height>
diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
index a3d4fb69c..41d9fef01 100644
--- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
+++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
@@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>15</width>
<height>20</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>324</width>
<height>21</height>
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>201</height>
diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
index d02ca9f0e..e0f52d6cb 100644
--- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui
+++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>120</width>
<height>21</height>
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -187,7 +187,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>40</height>
diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp
index 0c124bbeb..5c36772fb 100644
--- a/korganizer/plugins/printing/year/yearprint.cpp
+++ b/korganizer/plugins/printing/year/yearprint.cpp
@@ -177,8 +177,8 @@ void CalPrintYear::print( TQPainter &p, int width, int height )
title = i18n("date from -\nto", "%1 -\n%2");
}
drawHeader( p, title
- .arg( locale->formatDate( start ) )
- .arg( locale->formatDate( end ) ),
+ .tqarg( locale->formatDate( start ) )
+ .tqarg( locale->formatDate( end ) ),
calsys->addMonths( start, -1), calsys->addMonths( start, monthsPerPage ),
headerBox );
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 5c123d02c..79b146b35 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqheader.h>
#include <tqpushbutton.h>
#include <tqfont.h>
@@ -107,8 +107,8 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent,
void KOProjectView::createMainTask()
{
mMainTask = new KGanttItem(0,i18n("main task"),
- TQDateTime::currentDateTime(),
- TQDateTime::currentDateTime());
+ TQDateTime::tqcurrentDateTime(),
+ TQDateTime::tqcurrentDateTime());
mMainTask->setMode(KGanttItem::Rubberband);
mMainTask->setStyle(KGanttItem::DrawBorder | KGanttItem::DrawText |
KGanttItem::DrawHandle);
@@ -154,8 +154,8 @@ void KOProjectView::updateView()
#if 0
KGanttItem* t1 = new KGanttItem(mGantt->getMainTask(), "task 1, no subtasks",
- TQDateTime::currentDateTime().addDays(10),
- TQDateTime::currentDateTime().addDays(20) );
+ TQDateTime::tqcurrentDateTime().addDays(10),
+ TQDateTime::tqcurrentDateTime().addDays(20) );
KGanttItem* t2 = new KGanttItem(mGantt->getMainTask(), "task 2, subtasks, no rubberband",
TQDateTime(TQDate(2000,10,1)),
@@ -224,14 +224,14 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo)
if (todo->hasStartDate() && !todo->hasDueDate()) {
// start date but no due date
startDt = todo->dtStart();
- endDt = TQDateTime::currentDateTime();
+ endDt = TQDateTime::tqcurrentDateTime();
} else if (!todo->hasStartDate() && todo->hasDueDate()) {
// due date but no start date
startDt = todo->dtDue();
endDt = todo->dtDue();
} else if (!todo->hasStartDate() || !todo->hasDueDate()) {
- startDt = TQDateTime::currentDateTime();
- endDt = TQDateTime::currentDateTime();
+ startDt = TQDateTime::tqcurrentDateTime();
+ endDt = TQDateTime::tqcurrentDateTime();
} else {
startDt = todo->dtStart();
endDt = todo->dtDue();
diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h
index 6065f9c3e..d05610527 100644
--- a/korganizer/plugins/projectview/koprojectview.h
+++ b/korganizer/plugins/projectview/koprojectview.h
@@ -75,7 +75,7 @@ class KOProjectView : public KOrg::BaseView
DateList selectedDates();
/** Return number of shown dates. */
- int currentDateCount() { return 0; }
+ int tqcurrentDateCount() { return 0; }
void readSettings();
void writeSettings(KConfig *);
diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp
index 462fe5489..08fd51b16 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -22,7 +22,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <kconfig.h>
#include <kstandarddirs.h>
@@ -79,7 +79,7 @@ int KOTimeSpanView::maxDatesHint()
return 0;
}
-int KOTimeSpanView::currentDateCount()
+int KOTimeSpanView::tqcurrentDateCount()
{
return 0;
}
diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h
index 7018ce469..c121d8970 100644
--- a/korganizer/plugins/timespanview/kotimespanview.h
+++ b/korganizer/plugins/timespanview/kotimespanview.h
@@ -39,7 +39,7 @@ class KOTimeSpanView : public KOEventView
~KOTimeSpanView();
virtual int maxDatesHint();
- virtual int currentDateCount();
+ virtual int tqcurrentDateCount();
virtual Incidence::List selectedIncidences();
DateList selectedDates() { return DateList(); }
diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp
index 11204a7fb..b1c156ee5 100644
--- a/korganizer/plugins/timespanview/timespanwidget.cpp
+++ b/korganizer/plugins/timespanview/timespanwidget.cpp
@@ -24,7 +24,7 @@
#include <tqsplitter.h>
#include <tqlistview.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqheader.h>
#include <tqpushbutton.h>