diff options
Diffstat (limited to 'korganizer/plugins')
42 files changed, 141 insertions, 130 deletions
diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp index 3766e2ff..6f5c4d86 100644 --- a/korganizer/plugins/datenums/configdialog.cpp +++ b/korganizer/plugins/datenums/configdialog.cpp @@ -34,8 +34,8 @@ #include "configdialog.h" #include "configdialog.moc" -ConfigDialog::ConfigDialog(TQWidget *parent) - : KDialogBase(Plain,i18n("Configure Day Numbers"),Ok|Cancel,Ok,parent) +ConfigDialog::ConfigDialog(TQWidget *tqparent) + : KDialogBase(Plain,i18n("Configure Day Numbers"),Ok|Cancel,Ok,tqparent) { TQFrame *topFrame = plainPage(); TQVBoxLayout *topLayout = new TQVBoxLayout(topFrame,0,spacingHint()); diff --git a/korganizer/plugins/datenums/configdialog.h b/korganizer/plugins/datenums/configdialog.h index 992eeccc..f7291bd4 100644 --- a/korganizer/plugins/datenums/configdialog.h +++ b/korganizer/plugins/datenums/configdialog.h @@ -26,8 +26,9 @@ class TQButtonGroup; class ConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ConfigDialog(TQWidget *parent=0); + ConfigDialog(TQWidget *tqparent=0); virtual ~ConfigDialog(); protected: diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp index af022837..a8c8fbd9 100644 --- a/korganizer/plugins/datenums/datenums.cpp +++ b/korganizer/plugins/datenums/datenums.cpp @@ -40,9 +40,9 @@ Datenums::Datenums() mDateNum = config.readNumEntry( "ShowDayNumbers", 0 ); } -void Datenums::configure(TQWidget *parent) +void Datenums::configure(TQWidget *tqparent) { - ConfigDialog *dlg = new ConfigDialog(parent); + ConfigDialog *dlg = new ConfigDialog(tqparent); dlg->exec(); delete dlg; } diff --git a/korganizer/plugins/datenums/datenums.h b/korganizer/plugins/datenums/datenums.h index f9ca7783..c15b04eb 100644 --- a/korganizer/plugins/datenums/datenums.h +++ b/korganizer/plugins/datenums/datenums.h @@ -30,7 +30,7 @@ class Datenums : public CalendarDecoration { Datenums(); ~Datenums() {} - void configure(TQWidget *parent); + void configure(TQWidget *tqparent); TQString shortText(const TQDate &); TQString info(); diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index 8455d61b..f2aaa33e 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -46,18 +46,18 @@ using namespace KCal; // Needed for connecting slots class ExchangeFactory : public KOrg::PartFactory { public: - KOrg::Part *create(KOrg::MainWindow *parent, const char *name) + KOrg::Part *create(KOrg::MainWindow *tqparent, const char *name) { kdDebug(5850) << "Registering Exchange Plugin...\n"; KGlobal::locale()->insertCatalogue("libkpimexchange"); - return new Exchange(parent,name); + return new Exchange(tqparent,name); } }; K_EXPORT_COMPONENT_FACTORY( libkorg_exchange, ExchangeFactory ) -Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : - KOrg::Part(parent,name) +Exchange::Exchange(KOrg::MainWindow *tqparent, const char *name) : + KOrg::Part(tqparent,name) { setInstance( new KInstance( "korganizer" ) ); @@ -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->tqtopLevelWidget() ); + mClient->setWindow( tqparent->tqtopLevelWidget() ); setXMLFile("plugins/exchangeui.rc"); @@ -187,7 +187,7 @@ void Exchange::configure() mAccount->save( "Calendar/Exchange Plugin" ); } -void Exchange::showError( int error, const TQString& moreInfo /* = TQString::null */ ) +void Exchange::showError( int error, const TQString& moreInfo /* = TQString() */ ) { TQString errorText; switch( error ) { diff --git a/korganizer/plugins/exchange/exchange.h b/korganizer/plugins/exchange/exchange.h index 22a15f1c..8f021004 100644 --- a/korganizer/plugins/exchange/exchange.h +++ b/korganizer/plugins/exchange/exchange.h @@ -35,6 +35,7 @@ using namespace KCal; class Exchange : public KOrg::Part { Q_OBJECT + TQ_OBJECT public: Exchange( KOrg::MainWindow *, const char *name ); ~Exchange(); @@ -58,7 +59,7 @@ class Exchange : public KOrg::Part { private: void test2(); - void showError( int error, const TQString& moreInfo = TQString::null ); + void showError( int error, const TQString& moreInfo = TQString() ); KPIM::ExchangeClient *mClient; KPIM::ExchangeAccount* mAccount; diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp index fe01324a..76e6abe7 100644 --- a/korganizer/plugins/exchange/exchangeconfig.cpp +++ b/korganizer/plugins/exchange/exchangeconfig.cpp @@ -31,8 +31,8 @@ #include "exchangeconfig.h" -ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent ) - : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,parent) +ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* tqparent ) + : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,tqparent) { mAccount = account; diff --git a/korganizer/plugins/exchange/exchangeconfig.h b/korganizer/plugins/exchange/exchangeconfig.h index 0e18bfe2..095f73cd 100644 --- a/korganizer/plugins/exchange/exchangeconfig.h +++ b/korganizer/plugins/exchange/exchangeconfig.h @@ -30,8 +30,9 @@ class ExchangeConfig : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *parent=0); + ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *tqparent=0); virtual ~ExchangeConfig(); // protected: diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp index de56a3a1..8c5cb74f 100644 --- a/korganizer/plugins/exchange/exchangedialog.cpp +++ b/korganizer/plugins/exchange/exchangedialog.cpp @@ -30,8 +30,8 @@ #include "exchangedialog.h" -ExchangeDialog::ExchangeDialog( const TQDate &_start, const TQDate &_end, TQWidget *parent) - : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,parent) +ExchangeDialog::ExchangeDialog( const TQDate &_start, const TQDate &_end, TQWidget *tqparent) + : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,tqparent) { TQFrame *topFrame = plainPage(); TQGridLayout *topLayout = new TQGridLayout( topFrame, 2, 2, 3 ); diff --git a/korganizer/plugins/exchange/exchangedialog.h b/korganizer/plugins/exchange/exchangedialog.h index b2635f7a..1aa17c38 100644 --- a/korganizer/plugins/exchange/exchangedialog.h +++ b/korganizer/plugins/exchange/exchangedialog.h @@ -27,8 +27,9 @@ class TQComboBox; class ExchangeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *parent=0); + ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *tqparent=0); virtual ~ExchangeDialog(); protected slots: diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp index 6298151a..ee74a577 100644 --- a/korganizer/plugins/hebrew/configdialog.cpp +++ b/korganizer/plugins/hebrew/configdialog.cpp @@ -26,8 +26,8 @@ #include <kstandarddirs.h> #include <ksimpleconfig.h> -ConfigDialog::ConfigDialog(TQWidget * parent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok, - parent) +ConfigDialog::ConfigDialog(TQWidget * tqparent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok, + tqparent) { TQFrame *topFrame = plainPage(); TQVBoxLayout *topLayout = diff --git a/korganizer/plugins/hebrew/configdialog.h b/korganizer/plugins/hebrew/configdialog.h index 1638f75c..1ef1153f 100644 --- a/korganizer/plugins/hebrew/configdialog.h +++ b/korganizer/plugins/hebrew/configdialog.h @@ -27,9 +27,12 @@ */ class ConfigDialog:public KDialogBase { -Q_OBJECT public: + Q_OBJECT + TQ_OBJECT - ConfigDialog(TQWidget * parent = 0); +public: + + ConfigDialog(TQWidget * tqparent = 0); virtual ~ ConfigDialog(); protected: diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index 8a9f37bd..ce0d9696 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/korganizer/plugins/hebrew/hebrew.cpp @@ -103,9 +103,9 @@ TQString Hebrew::info() i18n("This plugin provides the date in the Jewish calendar."); } -void Hebrew::configure(TQWidget * parent) +void Hebrew::configure(TQWidget * tqparent) { - ConfigDialog *dlg = new ConfigDialog(parent); //parent? + ConfigDialog *dlg = new ConfigDialog(tqparent); //tqparent? dlg->exec(); delete dlg; diff --git a/korganizer/plugins/hebrew/hebrew.h b/korganizer/plugins/hebrew/hebrew.h index c337f7ef..80507fad 100644 --- a/korganizer/plugins/hebrew/hebrew.h +++ b/korganizer/plugins/hebrew/hebrew.h @@ -34,7 +34,7 @@ public: ~Hebrew() { } - void configure(TQWidget * parent); + void configure(TQWidget * tqparent); TQString shortText(const TQDate &); TQString info(); diff --git a/korganizer/plugins/hebrew/holiday.cpp b/korganizer/plugins/hebrew/holiday.cpp index 9b5ea3f1..c6afbb61 100644 --- a/korganizer/plugins/hebrew/holiday.cpp +++ b/korganizer/plugins/hebrew/holiday.cpp @@ -34,7 +34,7 @@ Holiday::~Holiday() * We are also influenced by the IsraelP flag */ -QStringList +TQStringList Holiday::FindHoliday(int month, int day, int weekday, int kvia, bool leap_year_p, bool israel_p, int day_number, int year) diff --git a/korganizer/plugins/hebrew/parsha.cpp b/korganizer/plugins/hebrew/parsha.cpp index d8ff2dd6..bba30f62 100644 --- a/korganizer/plugins/hebrew/parsha.cpp +++ b/korganizer/plugins/hebrew/parsha.cpp @@ -22,7 +22,7 @@ Parsha::~Parsha() { } -QString +TQString Parsha::FindParshaName(int daynumber, int kvia, bool leap_p, bool israel_p) { diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui index 1e41fdb8..ffd6a1e8 100644 --- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui +++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui @@ -2,7 +2,7 @@ <class>CalPrintJournalConfig_Base</class> <comment>Configuration page for the print journal mode.</comment> <author>Reinhold Kainhofer <reinhold@kainhofer.com></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CalPrintJournal_Base</cstring> </property> @@ -24,7 +24,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>mDateRangeGroup</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>mAllJournals</cstring> </property> @@ -49,7 +49,7 @@ <number>0</number> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>mRangeJournals</cstring> </property> @@ -63,7 +63,7 @@ <number>1</number> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout2</cstring> </property> @@ -88,7 +88,7 @@ </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mFromDateLabel</cstring> </property> @@ -107,7 +107,7 @@ <enum>StrongFocus</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mToDateLabel</cstring> </property> diff --git a/korganizer/plugins/printing/journal/journalprint.cpp b/korganizer/plugins/printing/journal/journalprint.cpp index 93bc51ef..089e8de6 100644 --- a/korganizer/plugins/printing/journal/journalprint.cpp +++ b/korganizer/plugins/printing/journal/journalprint.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_NOPRINTER diff --git a/korganizer/plugins/printing/journal/journalprint.h b/korganizer/plugins/printing/journal/journalprint.h index f1c0db44..c84153a4 100644 --- a/korganizer/plugins/printing/journal/journalprint.h +++ b/korganizer/plugins/printing/journal/journalprint.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef JOURNALPRINT_H #define JOURNALPRINT_H diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui index 22c6d577..857e063b 100644 --- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui +++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui @@ -2,7 +2,7 @@ <class>CalPrintListConfig_Base</class> <comment>Configuration page for the print list mode.</comment> <author>Reinhold Kainhofer <reinhold@kainhofer.com></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CalPrintList_Base</cstring> </property> @@ -24,7 +24,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>mDateRangeGroup</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout2</cstring> </property> @@ -63,7 +63,7 @@ </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mFromDateLabel</cstring> </property> @@ -82,7 +82,7 @@ <enum>StrongFocus</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mToDateLabel</cstring> </property> @@ -122,7 +122,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -133,7 +133,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mEvents</cstring> </property> @@ -141,7 +141,7 @@ <string>&Events</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mTodos</cstring> </property> @@ -149,7 +149,7 @@ <string>&To-dos</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mJournals</cstring> </property> diff --git a/korganizer/plugins/printing/list/listprint.cpp b/korganizer/plugins/printing/list/listprint.cpp index 4a90bfb5..c3bd91fa 100644 --- a/korganizer/plugins/printing/list/listprint.cpp +++ b/korganizer/plugins/printing/list/listprint.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_NOPRINTER diff --git a/korganizer/plugins/printing/list/listprint.h b/korganizer/plugins/printing/list/listprint.h index 561e0d46..db799727 100644 --- a/korganizer/plugins/printing/list/listprint.h +++ b/korganizer/plugins/printing/list/listprint.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LISTPRINT_H #define LISTPRINT_H diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui index c855976a..383074fe 100644 --- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui +++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui @@ -2,7 +2,7 @@ <class>CalPrintWhatsNextConfig_Base</class> <comment>Configuration page for the print whatsnext mode.</comment> <author>Reinhold Kainhofer <reinhold@kainhofer.com></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CalPrintWhatsNext_Base</cstring> </property> @@ -24,7 +24,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>mDateRangeGroup</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout2</cstring> </property> @@ -63,7 +63,7 @@ </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mFromDateLabel</cstring> </property> @@ -82,7 +82,7 @@ <enum>StrongFocus</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mToDateLabel</cstring> </property> diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp b/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp index b5d43ae9..fdae41d5 100644 --- a/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp +++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_NOPRINTER diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.h b/korganizer/plugins/printing/whatsnext/whatsnextprint.h index fb9ee66e..467e0257 100644 --- a/korganizer/plugins/printing/whatsnext/whatsnextprint.h +++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef WHATSNEXTPRINT_H #define WHATSNEXTPRINT_H diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui index 38b7822b..98f90597 100644 --- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui +++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui @@ -2,7 +2,7 @@ <class>CalPrintYearConfig_Base</class> <comment>Configuration page for the yearly print mode.</comment> <author>Reinhold Kainhofer <reinhold@kainhofer.com></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CalPrintYear_Base</cstring> </property> @@ -24,7 +24,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>mDateRangeGroup</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>mYearLabel</cstring> </property> @@ -49,7 +49,7 @@ <cstring>mYear</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>mPagesLabel</cstring> </property> @@ -60,7 +60,7 @@ <cstring>mPages</cstring> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>mYear</cstring> </property> @@ -91,7 +91,7 @@ </size> </property> </spacer> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>mPages</cstring> </property> @@ -115,7 +115,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>mDisplayOptionsGroup</cstring> </property> @@ -126,7 +126,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>mSubDaysLabel</cstring> </property> @@ -134,7 +134,7 @@ <string>Show sub-day events as:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>mHolidaysLabel</cstring> </property> @@ -142,7 +142,7 @@ <string>Show holidays as:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Text</string> @@ -160,7 +160,7 @@ <number>1</number> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>Text</string> diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp index 59a43db7..0c124bbe 100644 --- a/korganizer/plugins/printing/year/yearprint.cpp +++ b/korganizer/plugins/printing/year/yearprint.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_NOPRINTER @@ -154,7 +154,7 @@ void CalPrintYear::print( TQPainter &p, int width, int height ) int months = calsys->monthsInYear( start ); int maxdays = 1; for ( int i = 1; i< months; ++i ) { - maxdays = QMAX( maxdays, temp.daysInMonth() ); + maxdays = TQMAX( maxdays, temp.daysInMonth() ); temp = calsys->addMonths( temp, 1 ); } diff --git a/korganizer/plugins/printing/year/yearprint.h b/korganizer/plugins/printing/year/yearprint.h index f993e5da..99c1422e 100644 --- a/korganizer/plugins/printing/year/yearprint.h +++ b/korganizer/plugins/printing/year/yearprint.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef YEARPRINT_H #define YEARPRINT_H diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index d5abb1f4..d0d2db38 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -45,11 +45,11 @@ using namespace KOrg; -KOProjectViewItem::KOProjectViewItem(Todo *event,KGanttItem* parentTask, +KOProjectViewItem::KOProjectViewItem(Todo *event,KGanttItem* tqparentTask, const TQString& text, const TQDateTime& start, const TQDateTime& end) : - KGanttItem(parentTask,text,start,end) + KGanttItem(tqparentTask,text,start,end) { mEvent = event; } @@ -64,9 +64,9 @@ Todo *KOProjectViewItem::event() } -KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent, +KOProjectView::KOProjectView(Calendar *calendar,TQWidget* tqparent, const char* name) : - KOrg::BaseView(calendar,parent,name) + KOrg::BaseView(calendar,tqparent,name) { TQBoxLayout *topLayout = new TQVBoxLayout(this); @@ -183,7 +183,7 @@ void KOProjectView::updateView() */ // Put for each Event a KOProjectViewItem in the list view. Don't rely on a - // specific order of events. That means that we have to generate parent items + // specific order of events. That means that we have to generate tqparent items // recursively for proper hierarchical display of Todos. mTodoMap.clear(); Todo::List::ConstIterator it; @@ -202,7 +202,7 @@ TQMap<Todo *,KGanttItem *>::ConstIterator if (relatedTodo) { // kdDebug(5850) << " has Related" << endl; TQMap<Todo *,KGanttItem *>::ConstIterator itemIterator; - itemIterator = mTodoMap.find(relatedTodo); + itemIterator = mTodoMap.tqfind(relatedTodo); if (itemIterator == mTodoMap.end()) { // kdDebug(5850) << " related not yet in list" << endl; itemIterator = insertTodoItem (relatedTodo); @@ -216,7 +216,7 @@ TQMap<Todo *,KGanttItem *>::ConstIterator } } -KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo) +KGanttItem *KOProjectView::createTask(KGanttItem *tqparent,Todo *todo) { TQDateTime startDt; TQDateTime endDt; @@ -237,7 +237,7 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo) endDt = todo->dtDue(); } - KGanttItem *task = new KOProjectViewItem(todo,parent,todo->summary(),startDt, + KGanttItem *task = new KOProjectViewItem(todo,tqparent,todo->summary(),startDt, endDt); connect(task,TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), TQT_SLOT(taskChanged(KGanttItem*,KGanttItem::Change))); diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h index 39062179..b71afbd0 100644 --- a/korganizer/plugins/projectview/koprojectview.h +++ b/korganizer/plugins/projectview/koprojectview.h @@ -41,12 +41,12 @@ class TQStrList; class TQListView; /** - This class provides an item of the project view. It is a xQTask with + This class provides an item of the project view. It is a xTQTask with an additional Event attribute. */ class KOProjectViewItem : public KGanttItem { public: - KOProjectViewItem(Todo *,KGanttItem* parentTask, const TQString& text, + KOProjectViewItem(Todo *,KGanttItem* tqparentTask, const TQString& text, const TQDateTime& start, const TQDateTime& end); ~KOProjectViewItem(); @@ -66,8 +66,9 @@ class KOProjectViewItem : public KGanttItem { class KOProjectView : public KOrg::BaseView { Q_OBJECT + TQ_OBJECT public: - KOProjectView(Calendar *, TQWidget* parent=0, const char* name=0 ); + KOProjectView(Calendar *, TQWidget* tqparent=0, const char* name=0 ); ~KOProjectView() {} Incidence::List selectedIncidences(); diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index 2e7b3dc6..d6a009c8 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -35,18 +35,18 @@ using namespace KOrg; class ProjectViewFactory : public KOrg::PartFactory { public: - KOrg::Part *create(KOrg::MainWindow *parent, const char *name) + KOrg::Part *create(KOrg::MainWindow *tqparent, const char *name) { KGlobal::locale()->insertCatalogue( "kgantt" ); - return new ProjectView(parent,name); + return new ProjectView(tqparent,name); } }; K_EXPORT_COMPONENT_FACTORY( libkorg_projectview, ProjectViewFactory ) -ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) : - KOrg::Part(parent,name), mView(0) +ProjectView::ProjectView(KOrg::MainWindow *tqparent, const char *name) : + KOrg::Part(tqparent,name), mView(0) { setInstance( new KInstance( "korganizer" ) ); diff --git a/korganizer/plugins/projectview/projectview.h b/korganizer/plugins/projectview/projectview.h index a3f372a8..c6059650 100644 --- a/korganizer/plugins/projectview/projectview.h +++ b/korganizer/plugins/projectview/projectview.h @@ -25,6 +25,7 @@ class ProjectView : public KOrg::Part { Q_OBJECT + TQ_OBJECT public: ProjectView(KOrg::MainWindow *, const char *); ~ProjectView(); diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp index 01fc0cb4..7f70f12e 100644 --- a/korganizer/plugins/timespanview/kotimespanview.cpp +++ b/korganizer/plugins/timespanview/kotimespanview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -35,9 +35,9 @@ #include "kotimespanview.h" #include "kotimespanview.moc" -KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *parent, +KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *tqparent, const char *name) : - KOEventView( calendar, parent, name ) + KOEventView( calendar, tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h index 49e54ab6..f0d6c6ce 100644 --- a/korganizer/plugins/timespanview/kotimespanview.h +++ b/korganizer/plugins/timespanview/kotimespanview.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOTIMESPANVIEW_H #define KOTIMESPANVIEW_H @@ -32,8 +32,9 @@ class TimeSpanWidget; class KOTimeSpanView : public KOEventView { Q_OBJECT + TQ_OBJECT public: - KOTimeSpanView( Calendar *calendar, TQWidget *parent = 0, + KOTimeSpanView( Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0 ); ~KOTimeSpanView(); diff --git a/korganizer/plugins/timespanview/lineview.cpp b/korganizer/plugins/timespanview/lineview.cpp index 93a2f0bf..fe337f4e 100644 --- a/korganizer/plugins/timespanview/lineview.cpp +++ b/korganizer/plugins/timespanview/lineview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqpainter.h> @@ -31,8 +31,8 @@ #include "lineview.h" #include "lineview.moc" -LineView::LineView( TQWidget *parent, const char *name ) : - TQScrollView( parent, name ) +LineView::LineView( TQWidget *tqparent, const char *name ) : + TQScrollView( tqparent, name ) { mPixelWidth = 1000; diff --git a/korganizer/plugins/timespanview/lineview.h b/korganizer/plugins/timespanview/lineview.h index e98d905b..df028cdb 100644 --- a/korganizer/plugins/timespanview/lineview.h +++ b/korganizer/plugins/timespanview/lineview.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LINEVIEW_H #define LINEVIEW_H @@ -27,11 +27,12 @@ #include <tqscrollview.h> #include <tqptrlist.h> -class LineView : public QScrollView +class LineView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - LineView( TQWidget *parent = 0, const char *name = 0 ); + LineView( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~LineView(); int pixelWidth(); diff --git a/korganizer/plugins/timespanview/timeline.cpp b/korganizer/plugins/timespanview/timeline.cpp index 19ed7581..513701cd 100644 --- a/korganizer/plugins/timespanview/timeline.cpp +++ b/korganizer/plugins/timespanview/timeline.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqpainter.h> @@ -29,8 +29,8 @@ #include "timeline.h" #include "timeline.moc" -TimeLine::TimeLine( TQWidget *parent, const char *name ) : - TQScrollView( parent, name ) +TimeLine::TimeLine( TQWidget *tqparent, const char *name ) : + TQScrollView( tqparent, name ) { mPixelWidth = 1000; diff --git a/korganizer/plugins/timespanview/timeline.h b/korganizer/plugins/timespanview/timeline.h index 031763f7..d7718928 100644 --- a/korganizer/plugins/timespanview/timeline.h +++ b/korganizer/plugins/timespanview/timeline.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef TIMELINE_H #define TIMELINE_H @@ -27,11 +27,12 @@ #include <tqscrollview.h> #include <tqdatetime.h> -class TimeLine : public QScrollView +class TimeLine : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - TimeLine( TQWidget *parent = 0, const char *name = 0 ); + TimeLine( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~TimeLine(); void setDateRange( const TQDateTime &start, const TQDateTime &end ); diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index 24a45abb..3f9e2ee5 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -35,17 +35,17 @@ using namespace KOrg; class TimespanViewFactory : public KOrg::PartFactory { public: - KOrg::Part *create( KOrg::MainWindow *parent, const char *name ) + KOrg::Part *create( KOrg::MainWindow *tqparent, const char *name ) { - return new TimespanView( parent, name ); + return new TimespanView( tqparent, name ); } }; K_EXPORT_COMPONENT_FACTORY( libkorg_timespanview, TimespanViewFactory ) -TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) : - KOrg::Part(parent,name), mView(0) +TimespanView::TimespanView(KOrg::MainWindow *tqparent, const char *name) : + KOrg::Part(tqparent,name), mView(0) { setInstance( new KInstance( "korganizer" ) ); diff --git a/korganizer/plugins/timespanview/timespanview.h b/korganizer/plugins/timespanview/timespanview.h index cb2d17f7..5338e8ff 100644 --- a/korganizer/plugins/timespanview/timespanview.h +++ b/korganizer/plugins/timespanview/timespanview.h @@ -25,6 +25,7 @@ class TimespanView : public KOrg::Part { Q_OBJECT + TQ_OBJECT public: TimespanView(KOrg::MainWindow *, const char *); ~TimespanView(); diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp index 0e8f0c4b..e208c088 100644 --- a/korganizer/plugins/timespanview/timespanwidget.cpp +++ b/korganizer/plugins/timespanview/timespanwidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqsplitter.h> @@ -39,8 +39,8 @@ #include "timespanwidget.h" #include "timespanwidget.moc" -TimeSpanWidget::TimeSpanWidget( TQWidget *parent, const char *name ) : - TQWidget( parent, name ) +TimeSpanWidget::TimeSpanWidget( TQWidget *tqparent, const char *name ) : + TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -123,11 +123,8 @@ void TimeSpanWidget::clear() void TimeSpanWidget::updateView() { -#if QT_VERSION >= 300 mLineView->updateContents(); mTimeLine->updateContents(); -#else -#endif } void TimeSpanWidget::setDateRange( const TQDateTime &start, const TQDateTime &end ) diff --git a/korganizer/plugins/timespanview/timespanwidget.h b/korganizer/plugins/timespanview/timespanwidget.h index fa037872..103efc5f 100644 --- a/korganizer/plugins/timespanview/timespanwidget.h +++ b/korganizer/plugins/timespanview/timespanwidget.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef TimeSpanWidget_H #define TimeSpanWidget_H @@ -35,11 +35,12 @@ class TQListView; class LineView; class TimeLine; -class TimeSpanWidget : public QWidget +class TimeSpanWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - TimeSpanWidget( TQWidget *parent=0, const char *name=0 ); + TimeSpanWidget( TQWidget *tqparent=0, const char *name=0 ); virtual ~TimeSpanWidget(); void addItem( KCal::Event * ); |