From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korganizer/plugins/datenums/Makefile.am | 2 +- korganizer/plugins/exchange/Makefile.am | 3 ++- korganizer/plugins/exchange/exchange.cpp | 6 +++--- korganizer/plugins/hebrew/Makefile.am | 2 +- korganizer/plugins/printing/journal/Makefile.am | 2 +- .../printing/journal/calprintjournalconfig_base.ui | 12 ++++++------ .../plugins/printing/list/calprintlistconfig_base.ui | 12 ++++++------ .../printing/whatsnext/calprintwhatsnextconfig_base.ui | 12 ++++++------ korganizer/plugins/printing/year/Makefile.am | 2 +- .../plugins/printing/year/calprintyearconfig_base.ui | 10 +++++----- korganizer/plugins/projectview/koprojectview.cpp | 16 ++++++++-------- korganizer/plugins/projectview/koprojectview.h | 2 +- korganizer/plugins/timespanview/kotimespanview.cpp | 2 +- korganizer/plugins/timespanview/kotimespanview.h | 2 +- 14 files changed, 43 insertions(+), 42 deletions(-) (limited to 'korganizer/plugins') diff --git a/korganizer/plugins/datenums/Makefile.am b/korganizer/plugins/datenums/Makefile.am index 8081a564..9924bf45 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 39290aad..ab3eb177 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 3d3719ed..8455d61b 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 4f48cc58..3326ba1f 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 6238b1f1..626ecf17 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 bee91a36..1e41fdb8 100644 --- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui +++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui @@ -6,7 +6,7 @@ CalPrintJournal_Base - + 0 0 @@ -65,7 +65,7 @@ - layout2 + tqlayout2 @@ -81,7 +81,7 @@ Fixed - + 15 20 @@ -136,7 +136,7 @@ Expanding - + 324 21 @@ -157,7 +157,7 @@ Expanding - + 21 201 @@ -193,7 +193,7 @@ mFromDate mToDate - + kdateedit.h kdateedit.h diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui index cea873e6..22c6d577 100644 --- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui +++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui @@ -6,7 +6,7 @@ CalPrintList_Base - + 0 0 @@ -40,7 +40,7 @@ - layout2 + tqlayout2 @@ -56,7 +56,7 @@ Fixed - + 15 20 @@ -111,7 +111,7 @@ Expanding - + 324 21 @@ -169,7 +169,7 @@ Expanding - + 21 40 @@ -182,5 +182,5 @@ mFromDate mToDate - + diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui index c93e48ed..c855976a 100644 --- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui +++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui @@ -6,7 +6,7 @@ CalPrintWhatsNext_Base - + 0 0 @@ -40,7 +40,7 @@ - layout2 + tqlayout2 @@ -56,7 +56,7 @@ Fixed - + 15 20 @@ -111,7 +111,7 @@ Expanding - + 324 21 @@ -132,7 +132,7 @@ Expanding - + 21 201 @@ -168,7 +168,7 @@ mFromDate mToDate - + kdateedit.h kdateedit.h diff --git a/korganizer/plugins/printing/year/Makefile.am b/korganizer/plugins/printing/year/Makefile.am index f51e29e6..5d691357 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 43d906d6..38b7822b 100644 --- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui +++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui @@ -6,7 +6,7 @@ CalPrintYear_Base - + 0 0 @@ -84,7 +84,7 @@ Expanding - + 120 21 @@ -106,7 +106,7 @@ Expanding - + 131 21 @@ -187,7 +187,7 @@ Expanding - + 21 40 @@ -196,5 +196,5 @@ - + diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index 6c45ff42..d5abb1f4 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 aa856621..39062179 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 eec3ab46..01fc0cb4 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 d115b630..49e54ab6 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(); } -- cgit v1.2.3