From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korganizer/plugins/hebrew/configdialog.cpp | 18 +++++++++--------- korganizer/plugins/hebrew/configdialog.h | 12 ++++++------ korganizer/plugins/hebrew/converter.h | 8 ++++---- korganizer/plugins/hebrew/hebrew.cpp | 12 ++++++------ korganizer/plugins/hebrew/hebrew.h | 10 +++++----- korganizer/plugins/hebrew/holiday.cpp | 6 +++--- korganizer/plugins/hebrew/holiday.h | 10 +++++----- korganizer/plugins/hebrew/parsha.cpp | 4 ++-- korganizer/plugins/hebrew/parsha.h | 8 ++++---- 9 files changed, 44 insertions(+), 44 deletions(-) (limited to 'korganizer/plugins/hebrew') diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp index aad50a680..6298151ac 100644 --- a/korganizer/plugins/hebrew/configdialog.cpp +++ b/korganizer/plugins/hebrew/configdialog.cpp @@ -19,33 +19,33 @@ #include "configdialog.h" #include "configdialog.moc" #include -#include +#include #include #include #include #include #include -ConfigDialog::ConfigDialog(QWidget * parent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok, +ConfigDialog::ConfigDialog(TQWidget * parent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok, parent) { - QFrame *topFrame = plainPage(); - QVBoxLayout *topLayout = - new QVBoxLayout(topFrame, 0, spacingHint()); + TQFrame *topFrame = plainPage(); + TQVBoxLayout *topLayout = + new TQVBoxLayout(topFrame, 0, spacingHint()); - israel_box = new QCheckBox(topFrame); + israel_box = new TQCheckBox(topFrame); israel_box->setText(i18n("Use Israeli holidays")); topLayout->addWidget(israel_box); - parsha_box = new QCheckBox(topFrame); + parsha_box = new TQCheckBox(topFrame); parsha_box->setText(i18n("Show weekly parsha")); topLayout->addWidget(parsha_box); - omer_box = new QCheckBox(topFrame); + omer_box = new TQCheckBox(topFrame); omer_box->setText(i18n("Show day of Omer")); topLayout->addWidget(omer_box); - chol_box = new QCheckBox(topFrame); + chol_box = new TQCheckBox(topFrame); chol_box->setText(i18n("Show Chol HaMoed")); topLayout->addWidget(chol_box); diff --git a/korganizer/plugins/hebrew/configdialog.h b/korganizer/plugins/hebrew/configdialog.h index 1d0d18115..1638f75c3 100644 --- a/korganizer/plugins/hebrew/configdialog.h +++ b/korganizer/plugins/hebrew/configdialog.h @@ -20,7 +20,7 @@ #define CONFIGDIALOG_H #include -#include +#include /** @author Jonathan Singer @@ -29,7 +29,7 @@ class ConfigDialog:public KDialogBase { Q_OBJECT public: - ConfigDialog(QWidget * parent = 0); + ConfigDialog(TQWidget * parent = 0); virtual ~ ConfigDialog(); protected: @@ -39,10 +39,10 @@ protected: protected slots: void slotOk(); private: - QCheckBox * omer_box; - QCheckBox *parsha_box; - QCheckBox *israel_box; - QCheckBox *chol_box; + TQCheckBox * omer_box; + TQCheckBox *parsha_box; + TQCheckBox *israel_box; + TQCheckBox *chol_box; }; diff --git a/korganizer/plugins/hebrew/converter.h b/korganizer/plugins/hebrew/converter.h index 8a3bc8baf..430f10eb1 100644 --- a/korganizer/plugins/hebrew/converter.h +++ b/korganizer/plugins/hebrew/converter.h @@ -11,8 +11,8 @@ #ifndef CONVERTER_H #define CONVERTER_H -#include -#include +#include +#include struct DateResult { @@ -67,8 +67,8 @@ public: private: - static QStringList HebrewMonthNames; - static QStringList SecularMonthNames; + static TQStringList HebrewMonthNames; + static TQStringList SecularMonthNames; }; diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index 4c557d00d..9fb0f2fbf 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/korganizer/plugins/hebrew/hebrew.cpp @@ -43,7 +43,7 @@ public: K_EXPORT_COMPONENT_FACTORY( libkorg_hebrew, HebrewFactory ) -QString Hebrew::shortText(const QDate & date) +TQString Hebrew::shortText(const TQDate & date) { KConfig config("korganizerrc", true, false); // Open read-only, no kdeglobals @@ -55,7 +55,7 @@ QString Hebrew::shortText(const QDate & date) Holiday::ParshaP = config.readBoolEntry("Parsha", true); Holiday::CholP = config.readBoolEntry("Chol_HaMoed", true); Holiday::OmerP = config.readBoolEntry("Omer", true); - QString *label_text = new QString(); + TQString *label_text = new TQString(); int day = date.day(); int month = date.month(); @@ -74,14 +74,14 @@ QString Hebrew::shortText(const QDate & date) int hebrew_kvia = result.kvia; int hebrew_day_number = result.hebrew_day_number; - QStringList holidays = + TQStringList holidays = Holiday::FindHoliday(hebrew_month, hebrew_day, hebrew_day_of_week + 1, hebrew_kvia, hebrew_leap_year_p, IsraelP, hebrew_day_number, hebrew_year); KCalendarSystem *cal = KCalendarSystemFactory::create("hebrew"); - *label_text = QString("%1 %2").arg(cal->dayString(date, false)) + *label_text = TQString("%1 %2").arg(cal->dayString(date, false)) .arg(cal->monthName(date)); if (holidays.count()) @@ -97,13 +97,13 @@ QString Hebrew::shortText(const QDate & date) return *label_text; } -QString Hebrew::info() +TQString Hebrew::info() { return i18n("This plugin provides the date in the Jewish calendar."); } -void Hebrew::configure(QWidget * parent) +void Hebrew::configure(TQWidget * parent) { ConfigDialog *dlg = new ConfigDialog(parent); //parent? diff --git a/korganizer/plugins/hebrew/hebrew.h b/korganizer/plugins/hebrew/hebrew.h index 1153c1012..c337f7ef4 100644 --- a/korganizer/plugins/hebrew/hebrew.h +++ b/korganizer/plugins/hebrew/hebrew.h @@ -19,8 +19,8 @@ #ifndef KORG_HEBREW_H #define KORG_HEBREW_H -#include -#include +#include +#include #include using namespace KOrg; @@ -34,10 +34,10 @@ public: ~Hebrew() { } - void configure(QWidget * parent); - QString shortText(const QDate &); + void configure(TQWidget * parent); + TQString shortText(const TQDate &); - QString info(); + TQString info(); static bool IsraelP; private: diff --git a/korganizer/plugins/hebrew/holiday.cpp b/korganizer/plugins/hebrew/holiday.cpp index 732a00447..9b5ea3f11 100644 --- a/korganizer/plugins/hebrew/holiday.cpp +++ b/korganizer/plugins/hebrew/holiday.cpp @@ -15,7 +15,7 @@ bool Holiday::CholP; bool Holiday::OmerP; bool Holiday::ParshaP; -QStringList Holiday::holidays; +TQStringList Holiday::holidays; int Holiday::HolidayFlags; Holiday::Holiday() @@ -413,7 +413,7 @@ QStringList } /* Return a string corresponding to the nth day of the Omer */ -QString Holiday::Sfirah(int day) +TQString Holiday::Sfirah(int day) { /*static char buffer[40]; char *endings[] = {"th", "st", "nd", "rd"}; @@ -422,7 +422,7 @@ QString Holiday::Sfirah(int day) if ( ((day >= 11) && (day <= 19)) || (remainder > 3)) remainder = 0; sprintf(buffer, "%d%s day Omer", day, endings[remainder]); return buffer; */ - QString buffer; + TQString buffer; buffer.setNum(day); buffer + i18n(" Omer"); // Fix this to original function diff --git a/korganizer/plugins/hebrew/holiday.h b/korganizer/plugins/hebrew/holiday.h index 6c8c61d9d..f73083fd7 100644 --- a/korganizer/plugins/hebrew/holiday.h +++ b/korganizer/plugins/hebrew/holiday.h @@ -11,8 +11,8 @@ #ifndef HOLIDAY_H #define HOLIDAY_H -#include -#include +#include +#include #include /** @author Jonathan Singer @@ -24,12 +24,12 @@ public: Holiday(); ~Holiday(); - static QStringList FindHoliday(int month, int day, int weekday, + static TQStringList FindHoliday(int month, int day, int weekday, int kvia, bool leap_year_p, bool israel_p, int day_number, int year); - static QString Sfirah(int); + static TQString Sfirah(int); static bool CholP; static bool OmerP; @@ -37,7 +37,7 @@ public: private: - static QStringList holidays; + static TQStringList holidays; static int HolidayFlags; //supposed to be extern //parsha Parsha_lookup; diff --git a/korganizer/plugins/hebrew/parsha.cpp b/korganizer/plugins/hebrew/parsha.cpp index 21fdf8a4e..d8ff2dd6f 100644 --- a/korganizer/plugins/hebrew/parsha.cpp +++ b/korganizer/plugins/hebrew/parsha.cpp @@ -11,7 +11,7 @@ #include "parsha.h" #include -QStringList Parsha::parshiot_names; +TQStringList Parsha::parshiot_names; Parsha::Parsha() { @@ -243,7 +243,7 @@ QString } - QString buffer; + TQString buffer; if (array == NULL) /* Something is terribly wrong. */ diff --git a/korganizer/plugins/hebrew/parsha.h b/korganizer/plugins/hebrew/parsha.h index aac2625ff..59099b0ef 100644 --- a/korganizer/plugins/hebrew/parsha.h +++ b/korganizer/plugins/hebrew/parsha.h @@ -11,8 +11,8 @@ #ifndef PARSHA_H #define PARSHA_H -#include -#include +#include +#include /** @author Jonathan Singer @@ -23,11 +23,11 @@ public: Parsha(); ~Parsha(); - static QString FindParshaName(int daynumber, int kvia, bool leap_p, + static TQString FindParshaName(int daynumber, int kvia, bool leap_p, bool israel_p); private: - static QStringList parshiot_names; + static TQStringList parshiot_names; }; #endif -- cgit v1.2.1