head 1.2; access; symbols pkgsrc-2017Q3:1.1.0.96 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.92 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.90 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.88 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.86 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.84 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.82 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.80 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.78 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.76 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.74 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.72 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.70 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.68 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.66 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.64 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.62 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.60 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.58 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.56 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.54 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.52 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.50 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.48 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.46 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.44 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.42 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.40 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.38 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.36 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.34 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.32 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.30 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.28 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.26 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.24 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.22 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.20 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.18 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.16 pkgsrc-2008Q1:1.1.0.14 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.12 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.10 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.8 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.6 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.4 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.2 pkgsrc-2006Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2017.09.26.10.27.08; author wiz; state dead; branches; next 1.1; commitid 9ARpkXTuh9Wg2H8A; 1.1 date 2006.07.24.12.43.40; author markd; state Exp; branches; next ; desc @@ 1.2 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-ao,v 1.1 2006/07/24 12:43:40 markd Exp $ --- korganizer/koprefsdialog.cpp.orig 2005-09-10 20:24:47.000000000 +1200 +++ korganizer/koprefsdialog.cpp @@@@ -75,6 +75,7 @@@@ #include "stdcalendar.h" #include +#include KOPrefsDialogMain::KOPrefsDialogMain( QWidget *parent, const char *name ) : KPrefsModule( KOPrefs::instance(), parent, name ) @@@@ -169,67 +170,25 @@@@ class KOPrefsDialogTime : public KPrefsM connect( mTimeZoneCombo, SIGNAL( activated( int ) ), SLOT( slotWidChanged() ) ); - FILE *f; - char tempstring[101] = "Unknown"; - QString sCurrentlySet(i18n("Unknown")); + KTimezones *db; + const KTimezone *sCurrentlySet; int nCurrentlySet = 0; QStringList list; + db = new KTimezones(); // read the currently set time zone - #if defined(USE_SOLARIS) // MARCO - char buf[MAXPATHLEN]; - - snprintf(buf, MAXPATHLEN, - "/bin/fgrep 'TZ=' %s | /bin/head -n 1 | /bin/cut -b 4-", - INITFILE); - - if (f = popen(buf, "r")) - { - if (fgets(buf, MAXPATHLEN - 1, f) != NULL) - { - buf[strlen(buf) - 1] = '\0'; - sCurrentlySet = QString(buf); - } - pclose(f); - } - #else - if((f = fopen("/etc/timezone", "r")) != NULL) { - // get the currently set timezone - fgets(tempstring, 100, f); - tempstring[strlen(tempstring) - 1] = '\0'; - sCurrentlySet = QString(tempstring); - fclose(f); - } - #endif // !USE_SOLARIS + sCurrentlySet = db->local(); mTimeZoneCombo->insertItem(i18n("[No selection]")); // Read all system time zones - #if defined(USE_SOLARIS) // MARCO - snprintf(buf, MAXPATHLEN, - "/bin/find %s \\( -name src -prune \\) -o -type f -print | /bin/cut -b %d-", - ZONEINFODIR, strlen(ZONEINFODIR) + 2); - - if (f = popen(buf, "r")) - { - while(fgets(buf, MAXPATHLEN - 1, f) != NULL) - { - buf[strlen(buf) - 1] = '\0'; - list.append(buf); - } - pclose(f); - } - - #else - f = popen("grep -e ^[^#] /usr/share/zoneinfo/zone.tab | cut -f 3","r"); - if (!f) return; - while(fgets(tempstring, 100, f) != NULL) { - tempstring[strlen(tempstring)-1] = '\0'; - list.append(i18n(tempstring)); - tzonenames << tempstring; + const KTimezones::ZoneMap zones = db->allZones(); + for (KTimezones::ZoneMap::ConstIterator it = zones.begin(); it != zones.end(); ++it) + { + const KTimezone *zone = it.data(); + list.append(zone->name()); + tzonenames << zone->name(); } - pclose(f); - #endif // !USE_SOLARIS list.sort(); mTimeZoneCombo->insertStringList(list); @@@@ -237,7 +196,7 @@@@ class KOPrefsDialogTime : public KPrefsM // find the currently set time zone and select it for ( int i = 0; i < mTimeZoneCombo->count(); ++i ) { - if (mTimeZoneCombo->text(i) == sCurrentlySet) + if (mTimeZoneCombo->text(i) == sCurrentlySet->name()) { nCurrentlySet = i; break; @@@@ -246,6 +205,7 @@@@ class KOPrefsDialogTime : public KPrefsM mTimeZoneCombo->setCurrentItem(nCurrentlySet); QWhatsThis::add( mTimeZoneCombo, whatsThis ); + delete db; // holiday region selection QHBox *holidayRegBox = new QHBox( topFrame ); @ 1.1 log @In korganiser use the KTimezone class rather than trying to deal with timezones itself as that works on more systems. Bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @