From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korganizer/plugins/hebrew/configdialog.cpp | 4 ++-- korganizer/plugins/hebrew/configdialog.h | 7 +++++-- korganizer/plugins/hebrew/hebrew.cpp | 4 ++-- korganizer/plugins/hebrew/hebrew.h | 2 +- korganizer/plugins/hebrew/holiday.cpp | 2 +- korganizer/plugins/hebrew/parsha.cpp | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) (limited to 'korganizer/plugins/hebrew') diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp index 6298151ac..ee74a5777 100644 --- a/korganizer/plugins/hebrew/configdialog.cpp +++ b/korganizer/plugins/hebrew/configdialog.cpp @@ -26,8 +26,8 @@ #include #include -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 1638f75c3..1ef1153f7 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 8a9f37bd4..ce0d96966 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 c337f7ef4..80507fad4 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 9b5ea3f11..c6afbb613 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 d8ff2dd6f..bba30f620 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) { -- cgit v1.2.1