summaryrefslogtreecommitdiffstats
path: root/korganizer/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'korganizer/plugins')
-rw-r--r--korganizer/plugins/datenums/Makefile.am2
-rw-r--r--korganizer/plugins/exchange/Makefile.am3
-rw-r--r--korganizer/plugins/exchange/exchange.cpp6
-rw-r--r--korganizer/plugins/hebrew/Makefile.am2
-rw-r--r--korganizer/plugins/printing/journal/Makefile.am2
-rw-r--r--korganizer/plugins/printing/journal/calprintjournalconfig_base.ui12
-rw-r--r--korganizer/plugins/printing/list/calprintlistconfig_base.ui12
-rw-r--r--korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui12
-rw-r--r--korganizer/plugins/printing/year/Makefile.am2
-rw-r--r--korganizer/plugins/printing/year/calprintyearconfig_base.ui10
-rw-r--r--korganizer/plugins/projectview/koprojectview.cpp16
-rw-r--r--korganizer/plugins/projectview/koprojectview.h2
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.cpp2
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.h2
14 files changed, 43 insertions, 42 deletions
diff --git a/korganizer/plugins/datenums/Makefile.am b/korganizer/plugins/datenums/Makefile.am
index 8081a5645..9924bf459 100644
--- a/korganizer/plugins/datenums/Makefile.am
+++ b/korganizer/plugins/datenums/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_datenums.la
libkorg_datenums_la_SOURCES = configdialog.cpp datenums.cpp
libkorg_datenums_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
-libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_KDEUI)
+libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
noinst_HEADERS = datenums.h
diff --git a/korganizer/plugins/exchange/Makefile.am b/korganizer/plugins/exchange/Makefile.am
index 39290aadd..ab3eb1777 100644
--- a/korganizer/plugins/exchange/Makefile.am
+++ b/korganizer/plugins/exchange/Makefile.am
@@ -15,7 +15,8 @@ libkorg_exchange_la_SOURCES = exchange.cpp exchangedialog.cpp exchangeconfig.cp
libkorg_exchange_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
libkorg_exchange_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la \
$(top_builddir)/libkpimexchange/libkpimexchange.la \
- $(LIB_KDEUI) $(LIB_KPARTS)
+ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \
+ $(top_builddir)/libkcal/libkcal.la
noinst_HEADERS = exchange.h exchangedialog.h exchangeconfig.h
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index 3d3719ed4..8455d61bb 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::nul
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/hebrew/Makefile.am b/korganizer/plugins/hebrew/Makefile.am
index 4f48cc58b..3326ba1f6 100644
--- a/korganizer/plugins/hebrew/Makefile.am
+++ b/korganizer/plugins/hebrew/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libkorg_hebrew.la
libkorg_hebrew_la_SOURCES = hebrew.cpp configdialog.cpp holiday.cpp parsha.cpp converter.cpp
libkorg_hebrew_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
-libkorg_hebrew_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI)
+libkorg_hebrew_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
noinst_HEADERS = hebrew.h configdialog.h parsha.h converter.h holiday.h
diff --git a/korganizer/plugins/printing/journal/Makefile.am b/korganizer/plugins/printing/journal/Makefile.am
index 6238b1f18..626ecf17a 100644
--- a/korganizer/plugins/printing/journal/Makefile.am
+++ b/korganizer/plugins/printing/journal/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_journalprint.la
libkorg_journalprint_la_SOURCES =calprintjournalconfig_base.ui journalprint.cpp
libkorg_journalprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
-libkorg_journalprint_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
+libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libkdepim/ -lkdepim
noinst_HEADERS =
diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
index bee91a368..1e41fdb84 100644
--- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
+++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
@@ -6,7 +6,7 @@
<property name="name">
<cstring>CalPrintJournal_Base</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -65,7 +65,7 @@
</widget>
<widget class="QLayoutWidget">
<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>
@@ -193,7 +193,7 @@
<tabstop>mFromDate</tabstop>
<tabstop>mToDate</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdateedit.h</includehint>
<includehint>kdateedit.h</includehint>
diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
index cea873e6a..22c6d5771 100644
--- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui
+++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
@@ -6,7 +6,7 @@
<property name="name">
<cstring>CalPrintList_Base</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -40,7 +40,7 @@
</property>
<widget class="QLayoutWidget">
<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>
@@ -182,5 +182,5 @@
<tabstop>mFromDate</tabstop>
<tabstop>mToDate</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
index c93e48ed6..c855976a3 100644
--- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
+++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
@@ -6,7 +6,7 @@
<property name="name">
<cstring>CalPrintWhatsNext_Base</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -40,7 +40,7 @@
</property>
<widget class="QLayoutWidget">
<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>
@@ -168,7 +168,7 @@
<tabstop>mFromDate</tabstop>
<tabstop>mToDate</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdateedit.h</includehint>
<includehint>kdateedit.h</includehint>
diff --git a/korganizer/plugins/printing/year/Makefile.am b/korganizer/plugins/printing/year/Makefile.am
index f51e29e61..5d6913578 100644
--- a/korganizer/plugins/printing/year/Makefile.am
+++ b/korganizer/plugins/printing/year/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_yearlyprint.la
libkorg_yearlyprint_la_SOURCES =calprintyearconfig_base.ui yearprint.cpp
libkorg_yearlyprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
-libkorg_yearlyprint_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
+libkorg_yearlyprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KDEPRINT) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
noinst_HEADERS =
diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
index 43d906d6c..38b7822b2 100644
--- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui
+++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
@@ -6,7 +6,7 @@
<property name="name">
<cstring>CalPrintYear_Base</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -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>
@@ -196,5 +196,5 @@
</spacer>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 6c45ff424..d5abb1f42 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -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)),
@@ -188,7 +188,7 @@ void KOProjectView::updateView()
mTodoMap.clear();
Todo::List::ConstIterator it;
for( it = todoList.begin(); it != todoList.end(); ++it ) {
- if ( !mTodoMap.contains( *it ) ) {
+ if ( !mTodoMap.tqcontains( *it ) ) {
insertTodoItem( *it );
}
}
@@ -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 aa856621a..39062179e 100644
--- a/korganizer/plugins/projectview/koprojectview.h
+++ b/korganizer/plugins/projectview/koprojectview.h
@@ -74,7 +74,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 eec3ab461..01fc0cb40 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -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 d115b630b..49e54ab64 100644
--- a/korganizer/plugins/timespanview/kotimespanview.h
+++ b/korganizer/plugins/timespanview/kotimespanview.h
@@ -38,7 +38,7 @@ class KOTimeSpanView : public KOEventView
~KOTimeSpanView();
virtual int maxDatesHint();
- virtual int currentDateCount();
+ virtual int tqcurrentDateCount();
virtual Incidence::List selectedIncidences();
DateList selectedDates() { return DateList(); }
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 12:10:34 +0000