summaryrefslogtreecommitdiffstats
path: root/korganizer
diff options
context:
space:
mode:
Diffstat (limited to 'korganizer')
-rw-r--r--korganizer/actionmanager.cpp14
-rw-r--r--korganizer/actionmanager.h4
-rw-r--r--korganizer/calendarview.cpp10
-rw-r--r--korganizer/datenavigator.cpp6
-rw-r--r--korganizer/eventarchiver.cpp4
-rw-r--r--korganizer/journalentry.cpp2
-rw-r--r--korganizer/kdatenavigator.cpp6
-rw-r--r--korganizer/koagenda.cpp2
-rw-r--r--korganizer/koagendaitem.cpp12
-rw-r--r--korganizer/koagendaview.cpp4
-rw-r--r--korganizer/kodaymatrix.cpp2
-rw-r--r--korganizer/koeditorattachments.cpp4
-rw-r--r--korganizer/koeditorfreebusy.cpp6
-rw-r--r--korganizer/koeditorgeneralevent.cpp12
-rw-r--r--korganizer/koeditorgeneraljournal.cpp2
-rw-r--r--korganizer/koeditorgeneraltodo.cpp2
-rw-r--r--korganizer/koeditorrecurrence.cpp14
-rw-r--r--korganizer/koglobals.cpp6
-rw-r--r--korganizer/koincidenceeditor.cpp2
-rw-r--r--korganizer/komailclient.cpp8
-rw-r--r--korganizer/komonthview.cpp6
-rw-r--r--korganizer/koprefs.cpp4
-rw-r--r--korganizer/koprefsdialog.cpp12
-rw-r--r--korganizer/korgac/alarmdialog.cpp10
-rw-r--r--korganizer/korgac/alarmdockwindow.cpp2
-rw-r--r--korganizer/korgac/koalarmclient.cpp4
-rw-r--r--korganizer/korgac/korgacmain.cpp2
-rw-r--r--korganizer/korganizer.cpp2
-rw-r--r--korganizer/korganizer.h2
-rw-r--r--korganizer/korganizer_part.cpp8
-rw-r--r--korganizer/korganizer_part.h4
-rw-r--r--korganizer/kotimelineview.cpp2
-rw-r--r--korganizer/kotodoviewitem.cpp6
-rw-r--r--korganizer/kowhatsnextview.cpp18
-rw-r--r--korganizer/main.cpp6
-rw-r--r--korganizer/multiagendaview.cpp6
-rw-r--r--korganizer/plugins/exchange/exchange.cpp2
-rw-r--r--korganizer/plugins/hebrew/configdialog.cpp2
-rw-r--r--korganizer/plugins/hebrew/hebrew.cpp2
-rw-r--r--korganizer/plugins/printing/year/yearprint.cpp2
-rw-r--r--korganizer/plugins/projectview/projectview.cpp2
-rw-r--r--korganizer/printing/calprintdefaultplugins.cpp14
-rw-r--r--korganizer/printing/calprintpluginbase.cpp28
-rw-r--r--korganizer/timelabels.cpp8
-rw-r--r--korganizer/timezone.cpp2
-rw-r--r--korganizer/urihandler.cpp4
46 files changed, 141 insertions, 141 deletions
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 52e47d57b..741a04f86 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -754,9 +754,9 @@ void ActionManager::file_icalimport()
return;
}
- KProcess proc;
+ TDEProcess proc;
proc << "ical2vcal" << tmpfn.name();
- bool success = proc.start( KProcess::Block );
+ bool success = proc.start( TDEProcess::Block );
if ( !success ) {
kdDebug(5850) << "Error starting ical2vcal." << endl;
@@ -1290,11 +1290,11 @@ void ActionManager::setDestinationPolicy()
void ActionManager::configureDateTime()
{
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "kcmshell" << "language";
- connect( proc,TQT_SIGNAL( processExited( KProcess * ) ),
- TQT_SLOT( configureDateTimeFinished( KProcess * ) ) );
+ connect( proc,TQT_SIGNAL( processExited( TDEProcess * ) ),
+ TQT_SLOT( configureDateTimeFinished( TDEProcess * ) ) );
if ( !proc->start() ) {
KMessageBox::sorry( dialogParent(),
@@ -1405,7 +1405,7 @@ bool ActionManager::addIncidence( const TQString& ical )
return mCalendarView->addIncidence( ical );
}
-void ActionManager::configureDateTimeFinished( KProcess *proc )
+void ActionManager::configureDateTimeFinished( TDEProcess *proc )
{
delete proc;
}
@@ -1875,7 +1875,7 @@ void ActionManager::goDate( const TQDate& date )
void ActionManager::goDate( const TQString& date )
{
- goDate( KGlobal::locale()->readDate( date ) );
+ goDate( TDEGlobal::locale()->readDate( date ) );
}
void ActionManager::showDate(const TQDate & date)
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index 47e4c4d81..8c6a44026 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -51,7 +51,7 @@ class KRecentFilesAction;
class KSelectAction;
class KToggleAction;
class KConfig;
-class KProcess;
+class TDEProcess;
class KTempFile;
class KXMLGUIClient;
class CalendarView;
@@ -338,7 +338,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
/** called by the auto archive timer to automatically delete/archive events */
void slotAutoArchive();
- void configureDateTimeFinished(KProcess *);
+ void configureDateTimeFinished(TDEProcess *);
void setTitle();
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ab725b4c6..2f31310b1 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -775,7 +775,7 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence,
Todo *todo = static_cast<Todo *>(newIncidence);
if ( todo->isCompleted() ||
modification == KOGlobals::COMPLETION_MODIFIED_WITH_RECURRENCE ) {
- TQString timeStr = KGlobal::locale()->formatTime( TQTime::currentTime() );
+ TQString timeStr = TDEGlobal::locale()->formatTime( TQTime::currentTime() );
TQString description = i18n( "To-do completed: %1 (%2)" ).arg(
newIncidence->summary() ).arg( timeStr );
@@ -786,7 +786,7 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence,
journal = new Journal();
journal->setDtStart( TQDateTime::currentDateTime() );
- TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() );
+ TQString dateStr = TDEGlobal::locale()->formatDate( TQDate::currentDate() );
journal->setSummary( i18n("Journal of %1").arg( dateStr ) );
journal->setDescription( description );
@@ -1677,8 +1677,8 @@ void CalendarView::mailFreeBusy( int daysToPublish )
KOPrefs::instance()->email() ) );
kdDebug(5850) << "calendarview: schedule_publish_freebusy: startDate: "
- << KGlobal::locale()->formatDateTime( start ) << " End Date: "
- << KGlobal::locale()->formatDateTime( end ) << endl;
+ << TDEGlobal::locale()->formatDateTime( start ) << " End Date: "
+ << TDEGlobal::locale()->formatDateTime( end ) << endl;
PublishDialog *publishdlg = new PublishDialog();
if ( publishdlg->exec() == TQDialog::Accepted ) {
@@ -2405,7 +2405,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
"Do you want to delete only the current one on %2, only all "
"future recurrences, or all its recurrences?" )
.arg( incidence->summary() )
- .arg( KGlobal::locale()->formatDate(itemDate)),
+ .arg( TDEGlobal::locale()->formatDate(itemDate)),
i18n("KOrganizer Confirmation"), i18n("Delete C&urrent"),
i18n("Delete &Future"),
i18n("Delete &All"));
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index bb4206b0c..4d85a7a4d 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -104,7 +104,7 @@ void DateNavigator::selectDates( const TQDate &d, int count, const TQDate &prefe
void DateNavigator::selectWeekByDay( int weekDay, const TQDate &d, const TQDate &preferredMonth )
{
int dateCount = mSelectedDates.count();
- bool weekStart = ( weekDay == KGlobal::locale()->weekStartDay() );
+ bool weekStart = ( weekDay == TDEGlobal::locale()->weekStartDay() );
if ( weekStart && dateCount == 7 ) {
selectWeek( d, preferredMonth );
} else {
@@ -121,7 +121,7 @@ void DateNavigator::selectWeek( const TQDate &d, const TQDate &preferredMonth )
{
int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d );
- int weekStart = KGlobal::locale()->weekStartDay();
+ int weekStart = TDEGlobal::locale()->weekStartDay();
TQDate firstDate = d.addDays( weekStart - dayOfWeek );
@@ -139,7 +139,7 @@ void DateNavigator::selectWorkWeek()
void DateNavigator::selectWorkWeek( const TQDate &d )
{
- int weekStart = KGlobal::locale()->weekStartDay();
+ int weekStart = TDEGlobal::locale()->weekStartDay();
int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d );
diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp
index be6854413..536c37f73 100644
--- a/korganizer/eventarchiver.cpp
+++ b/korganizer/eventarchiver.cpp
@@ -118,7 +118,7 @@ void EventArchiver::run( Calendar* calendar, const TQDate& limitDate, TQWidget*
KMessageBox::information(
widget,
i18n( "There are no incidences available to archive before the specified cut-off date %1. "
- "Archiving will not be performed." ).arg( KGlobal::locale()->formatDate( limitDate ) ),
+ "Archiving will not be performed." ).arg( TDEGlobal::locale()->formatDate( limitDate ) ),
"ArchiverNoIncidences" );
}
return;
@@ -147,7 +147,7 @@ void EventArchiver::deleteIncidences( Calendar* calendar, const TQDate& limitDat
int result = KMessageBox::warningContinueCancelList(
widget, i18n("Delete all items before %1 without saving?\n"
"The following items will be deleted:")
- .arg(KGlobal::locale()->formatDate(limitDate)), incidenceStrs,
+ .arg(TDEGlobal::locale()->formatDate(limitDate)), incidenceStrs,
i18n("Delete Old Items"),KStdGuiItem::del());
if (result != KMessageBox::Continue)
return;
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 7808dcbb5..3594a8605 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -86,7 +86,7 @@ JournalDateEntry::~JournalDateEntry()
void JournalDateEntry::setDate(const TQDate &date)
{
TQString dtstring = TQString( "<qt><center><b><i>%1</i></b> " )
- .arg( KGlobal::locale()->formatDate(date) );
+ .arg( TDEGlobal::locale()->formatDate(date) );
dtstring += " <font size=\"-1\"><a href=\"#\">" +
i18n("[Add Journal Entry]") +
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 087804103..dcf2a3ebd 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -61,7 +61,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
connect( mNavigatorBar, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) );
int i;
- TQString generalFont = KGlobalSettings::generalFont().family();
+ TQString generalFont = TDEGlobalSettings::generalFont().family();
// Set up the heading fields.
for( i = 0; i < 7; i++ ) {
@@ -149,7 +149,7 @@ TQDate KDateNavigator::startDate() const
const KCalendarSystem *calsys = KOGlobals::self()->calendarSystem();
int m_fstDayOfWkCalsys = calsys->dayOfWeek( dayone );
- int weekstart = KGlobal::locale()->weekStartDay();
+ int weekstart = TDEGlobal::locale()->weekStartDay();
// If month begins on Monday and Monday is first day of week,
// month should begin on second line. Sunday doesn't have this problem.
@@ -234,7 +234,7 @@ void KDateNavigator::updateView()
void KDateNavigator::updateConfig()
{
int day;
- int weekstart = KGlobal::locale()->weekStartDay();
+ int weekstart = TDEGlobal::locale()->weekStartDay();
for( int i = 0; i < 7; i++ ) {
day = weekstart + i <= 7 ? weekstart + i : ( weekstart + i ) % 7;
TQString dayName = KOGlobals::self()->calendarSystem()->weekDayName( day,
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 6c1c79521..484cc1657 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -147,7 +147,7 @@ void MarcusBains::updateLocationRecalc( bool recalculate )
if(recalculate)
mTimeBox->setFont(KOPrefs::instance()->mMarcusBainsFont);
- TQString timeStr = KGlobal::locale()->formatTime(tim, KOPrefs::instance()->mMarcusBainsShowSeconds);
+ TQString timeStr = TDEGlobal::locale()->formatTime(tim, KOPrefs::instance()->mMarcusBainsShowSeconds);
TQFontMetrics fm = fontMetrics();
mTimeBox->setText( timeStr );
TQSize sz( fm.width( timeStr + ' ' ), fm.height() );
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index f11ea8c01..216f1dfd8 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -836,17 +836,17 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
TQString shortH;
TQString longH;
if ( !isMultiItem() ) {
- shortH = KGlobal::locale()->formatTime(mIncidence->dtStart().time());
+ shortH = TDEGlobal::locale()->formatTime(mIncidence->dtStart().time());
if (mIncidence->type() != "Todo")
longH = i18n("%1 - %2").arg(shortH)
- .arg(KGlobal::locale()->formatTime(mIncidence->dtEnd().time()));
+ .arg(TDEGlobal::locale()->formatTime(mIncidence->dtEnd().time()));
else
longH = shortH;
} else if ( !mMultiItemInfo->mFirstMultiItem ) {
- shortH = KGlobal::locale()->formatTime(mIncidence->dtStart().time());
+ shortH = TDEGlobal::locale()->formatTime(mIncidence->dtStart().time());
longH = shortH;
} else {
- shortH = KGlobal::locale()->formatTime(mIncidence->dtEnd().time());
+ shortH = TDEGlobal::locale()->formatTime(mIncidence->dtEnd().time());
longH = i18n("- %1").arg(shortH);
}
@@ -937,8 +937,8 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
(mIncidence->dtStart() != mIncidence->dtEnd()) ) { // multi days
shortH = longH =
i18n("%1 - %2")
- .arg(KGlobal::locale()->formatDate(mIncidence->dtStart().date()))
- .arg(KGlobal::locale()->formatDate(mIncidence->dtEnd().date()));
+ .arg(TDEGlobal::locale()->formatDate(mIncidence->dtStart().date()))
+ .arg(TDEGlobal::locale()->formatDate(mIncidence->dtEnd().date()));
// paint headline
p.fillRect( 0, 0, width(), (ft/2) + margin + hlHeight,
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 5b46fedb3..91cf417dd 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -288,7 +288,7 @@ KOAgendaView::KOAgendaView( Calendar *cal,
topLayout->addWidget(mSplitterAgenda);
#if KDE_IS_VERSION( 3, 1, 93 )
- mSplitterAgenda->setOpaqueResize( KGlobalSettings::opaqueResize() );
+ mSplitterAgenda->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
#else
mSplitterAgenda->setOpaqueResize();
#endif
@@ -625,7 +625,7 @@ void KOAgendaView::createDayLabels( bool force )
// dayLayout->setMinimumWidth(1);
int dW = calsys->dayOfWeek(date);
- TQString veryLongStr = KGlobal::locale()->formatDate( date );
+ TQString veryLongStr = TDEGlobal::locale()->formatDate( date );
TQString longstr = i18n( "short_weekday date (e.g. Mon 13)","%1 %2" )
.arg( calsys->weekDayName( dW, true ) )
.arg( calsys->day(date) );
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index d84340789..cf6fa1021 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -717,7 +717,7 @@ TQPair<TQDate,TQDate> KODayMatrix::matrixLimits( const TQDate &month )
calSys->setYMD( d, calSys->year( month ), calSys->month( month ), 1 );
const int dayOfWeek = calSys->dayOfWeek( d );
- const int weekstart = KGlobal::locale()->weekStartDay();
+ const int weekstart = TDEGlobal::locale()->weekStartDay();
d = d.addDays( weekstart - dayOfWeek );
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index ec23e9ee4..cf10b9fd0 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -132,7 +132,7 @@ class AttachmentListItem : public KIconViewItem
static TQPixmap icon( KMimeType::Ptr mimeType, const TQString &uri )
{
TQString iconStr = mimeType->icon( uri, false );
- return KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Small );
+ return TDEGlobal::iconLoader()->loadIcon( iconStr, KIcon::Small );
}
void readAttachment()
{
@@ -234,7 +234,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item,
grid->addWidget( new TQLabel( i18n( "Size:" ), topFrame ), 4, 0 );
grid->addWidget( new TQLabel( TQString::fromLatin1( "%1 (%2)" ).
arg( KIO::convertSize( size ) ).
- arg( KGlobal::locale()->formatNumber(
+ arg( TDEGlobal::locale()->formatNumber(
size, 0 ) ), topFrame ), 4, 2 );
}
vbl->addStretch( 10 );
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index 807901b83..c97ad4568 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -188,10 +188,10 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb )
toolTip += "<br>";
}
toolTip += "<i>" + i18n( "Start:" ) + "</i>" + "&nbsp;";
- toolTip += KGlobal::locale()->formatDateTime( per.start() );
+ toolTip += TDEGlobal::locale()->formatDateTime( per.start() );
toolTip += "<br>";
toolTip += "<i>" + i18n( "End:" ) + "</i>" + "&nbsp;";
- toolTip += KGlobal::locale()->formatDateTime( per.end() );
+ toolTip += TDEGlobal::locale()->formatDateTime( per.end() );
toolTip += "<br>";
toolTip += "</qt>";
newSubItem->setTooltipText( toolTip );
@@ -320,7 +320,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
mGanttView->setShowLegendButton( false );
// Initially, center to current date
mGanttView->centerTimelineAfterShow( TQDateTime::currentDateTime() );
- if ( KGlobal::locale()->use12Clock() )
+ if ( TDEGlobal::locale()->use12Clock() )
mGanttView->setHourFormat( KDGanttView::Hour_12 );
else
mGanttView->setHourFormat( KDGanttView::Hour_24_FourDigit );
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index a5dd834fe..dc54a5268 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -197,7 +197,7 @@ void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * la
{
TQBoxLayout *topLayout = new TQHBoxLayout( layout );
mInvitationBar = new TQFrame( parent );
- mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() );
+ mInvitationBar->setPaletteBackgroundColor( TDEGlobalSettings::alternateBackgroundColor() );
topLayout->addWidget( mInvitationBar );
TQBoxLayout *barLayout = new TQHBoxLayout( mInvitationBar );
@@ -468,7 +468,7 @@ void KOEditorGeneralEvent::setDuration()
void KOEditorGeneralEvent::emitDateTimeStr()
{
- KLocale *l = KGlobal::locale();
+ KLocale *l = TDEGlobal::locale();
TQString from,to;
if (mAlldayEventCheckbox->isChecked()) {
@@ -493,14 +493,14 @@ bool KOEditorGeneralEvent::validateInput()
if (!mStartTimeEdit->inputIsValid()) {
KMessageBox::sorry( 0,
i18n("Please specify a valid start time, for example '%1'.")
- .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
+ .arg( TDEGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
return false;
}
if (!mEndTimeEdit->inputIsValid()) {
KMessageBox::sorry( 0,
i18n("Please specify a valid end time, for example '%1'.")
- .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
+ .arg( TDEGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
return false;
}
}
@@ -508,14 +508,14 @@ bool KOEditorGeneralEvent::validateInput()
if (!mStartDateEdit->date().isValid()) {
KMessageBox::sorry( 0,
i18n("Please specify a valid start date, for example '%1'.")
- .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+ .arg( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
return false;
}
if (!mEndDateEdit->date().isValid()) {
KMessageBox::sorry( 0,
i18n("Please specify a valid end date, for example '%1'.")
- .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+ .arg( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
return false;
}
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index de97376d7..3741acb3f 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -196,7 +196,7 @@ bool KOEditorGeneralJournal::validateInput()
if (!mDateEdit->date().isValid()) {
KMessageBox::sorry( 0,
i18n("Please specify a valid date, for example '%1'.")
- .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+ .arg( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
return false;
}
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 5ba7188ba..54822c83e 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -565,7 +565,7 @@ void KOEditorGeneralTodo::completedChanged()
void KOEditorGeneralTodo::dateChanged()
{
- KLocale *l = KGlobal::locale();
+ KLocale *l = TDEGlobal::locale();
TQString dateTimeStr = "";
if ( mStartCheck->isChecked() ) {
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 4b5889a8a..3aceab473 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -183,7 +183,7 @@ RecurWeekly::RecurWeekly( TQWidget *parent, const char *name ) :
TQHBox *dayBox = new TQHBox( this );
topLayout->addWidget( dayBox, 1, AlignVCenter );
// Respect start of week setting
- int weekStart=KGlobal::locale()->weekStartDay();
+ int weekStart=TDEGlobal::locale()->weekStartDay();
for ( int i = 0; i < 7; ++i ) {
// i is the nr of the combobox, not the day of week!
// label=(i+weekStart+6)%7 + 1;
@@ -631,7 +631,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) :
void ExceptionsWidget::addException()
{
TQDate date = mExceptionDateEdit->date();
- TQString dateStr = KGlobal::locale()->formatDate( date );
+ TQString dateStr = TDEGlobal::locale()->formatDate( date );
if( !mExceptionList->findItem( dateStr ) ) {
mExceptionDates.append( date );
mExceptionList->insertItem( dateStr );
@@ -645,7 +645,7 @@ void ExceptionsWidget::changeException()
TQDate date = mExceptionDateEdit->date();
mExceptionDates[ pos ] = date;
- mExceptionList->changeItem( KGlobal::locale()->formatDate( date ), pos );
+ mExceptionList->changeItem( TDEGlobal::locale()->formatDate( date ), pos );
}
void ExceptionsWidget::deleteException()
@@ -663,7 +663,7 @@ void ExceptionsWidget::setDates( const DateList &dates )
mExceptionDates.clear();
DateList::ConstIterator dit;
for ( dit = dates.begin(); dit != dates.end(); ++dit ) {
- mExceptionList->insertItem( KGlobal::locale()->formatDate(* dit ) );
+ mExceptionList->insertItem( TDEGlobal::locale()->formatDate(* dit ) );
mExceptionDates.append( *dit );
}
}
@@ -824,7 +824,7 @@ void RecurrenceRangeWidget::setDateTimes( const TQDateTime &start,
const TQDateTime & )
{
mStartDateLabel->setText( i18n("Begins on: %1")
- .arg( KGlobal::locale()->formatDate( start.date() ) ) );
+ .arg( TDEGlobal::locale()->formatDate( start.date() ) ) );
}
///////////////////////// RecurrenceRangeDialog ///////////////////////////
@@ -1394,8 +1394,8 @@ bool KOEditorRecurrence::validateInput()
mEventStartDt.isValid() && ((mRecurrenceRange->endDate())<mEventStartDt.date()) ) {
KMessageBox::sorry( 0,
i18n("The end date '%1' of the recurrence must be after the start date '%2' of the event.")
- .arg( KGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) )
- .arg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) );
+ .arg( TDEGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) )
+ .arg( TDEGlobal::locale()->formatDate( mEventStartDt.date() ) ) );
return false;
}
int recurrenceType = mRecurrenceChooser->type();
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index 3077e0cdf..3c1c8e4f7 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -72,7 +72,7 @@ KOGlobals::KOGlobals()
mOwnInstance = new TDEInstance( "korganizer" );
mOwnInstance->config()->setGroup( "General" );
mOwnInstance->iconLoader()->addAppDir( "tdepim" );
- KGlobal::iconLoader()->addAppDir( "tdepim" );
+ TDEGlobal::iconLoader()->addAppDir( "tdepim" );
mAlarmClient = new AlarmClient;
}
@@ -91,7 +91,7 @@ KOGlobals::~KOGlobals()
const KCalendarSystem *KOGlobals::calendarSystem() const
{
- return KGlobal::locale()->calendar();
+ return TDEGlobal::locale()->calendar();
}
AlarmClient *KOGlobals::alarmClient() const
@@ -106,7 +106,7 @@ void KOGlobals::fitDialogToScreen( TQWidget *wid, bool force )
int w = wid->frameSize().width();
int h = wid->frameSize().height();
- TQRect desk = KGlobalSettings::desktopGeometry( wid );
+ TQRect desk = TDEGlobalSettings::desktopGeometry( wid );
if ( w > desk.width() ) {
w = desk.width();
resized = true;
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 55afba9ed..bb535a95b 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -193,7 +193,7 @@ void KOIncidenceEditor::setupDesignerTabs( const TQString &type )
{
TQStringList activePages = KOPrefs::instance()->activeDesignerFields();
- TQStringList list = KGlobal::dirs()->findAllResources( "data",
+ TQStringList list = TDEGlobal::dirs()->findAllResources( "data",
"korganizer/designer/" + type + "/*.ui", true, true );
for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) {
const TQString &fn = (*it).mid( (*it).findRev('/') + 1 );
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index a6edc6486..788194034 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -196,20 +196,20 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
if (command.isNull()) return false; // give up
command.append(TQString::fromLatin1(" -s "));
- command.append(KProcess::quote(subject));
+ command.append(TDEProcess::quote(subject));
if (bcc) {
command.append(TQString::fromLatin1(" -b "));
- command.append(KProcess::quote(from));
+ command.append(TDEProcess::quote(from));
}
if ( !cc.isEmpty() ) {
command.append(" -c ");
- command.append(KProcess::quote(cc));
+ command.append(TDEProcess::quote(cc));
}
command.append(" ");
- command.append(KProcess::quote(to));
+ command.append(TDEProcess::quote(to));
needHeaders = false;
}
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 6bb94f5cb..fb52f4b6a 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -566,7 +566,7 @@ class MonthViewCell::CreateItemVisitor :
if (event->doesFloat())
text = event->summary();
else {
- text = KGlobal::locale()->formatTime(event->dtStart().time());
+ text = TDEGlobal::locale()->formatTime(event->dtStart().time());
dt.setTime( event->dtStart().time() );
text += ' ' + event->summary();
}
@@ -603,7 +603,7 @@ class MonthViewCell::CreateItemVisitor :
TQDateTime dt( mDate );
if ( todo->hasDueDate() && !todo->doesFloat() &&
todo->dtDue().time() != TQTime( 0,0 ) && todo->dtDue().time().isValid() ) {
- text += KGlobal::locale()->formatTime( todo->dtDue().time() );
+ text += TDEGlobal::locale()->formatTime( todo->dtDue().time() );
text += ' ';
dt.setTime( todo->dtDue().time() );
}
@@ -928,7 +928,7 @@ bool KOMonthView::eventDurationHint( TQDateTime &startDt, TQDateTime &endDt, boo
void KOMonthView::updateConfig()
{
- mWeekStartDay = KGlobal::locale()->weekStartDay();
+ mWeekStartDay = TDEGlobal::locale()->weekStartDay();
TQFontMetrics fontmetric( mDayLabels[0]->font() );
mWidthLongDayLabel = 0;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index a7c4eea21..58248ba49 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -72,12 +72,12 @@ KOPrefs::KOPrefs() :
mDefaultResourceColor = TQColor();//Default is a color invalid
- mDefaultTimeBarFont = KGlobalSettings::generalFont();
+ mDefaultTimeBarFont = TDEGlobalSettings::generalFont();
// make a large default time bar font, at least 16 points.
mDefaultTimeBarFont.setPointSize(
TQMAX( mDefaultTimeBarFont.pointSize() + 4, 16 ) );
- mDefaultMonthViewFont = KGlobalSettings::generalFont();
+ mDefaultMonthViewFont = TDEGlobalSettings::generalFont();
// make it a bit smaller
mDefaultMonthViewFont.setPointSize( mDefaultMonthViewFont.pointSize() - 2 );
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 15003755f..54ca4dfc8 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -343,7 +343,7 @@ class KOPrefsDialogTime : public KPrefsModule
cb->setText( TQString() );
if ( KOPrefs::instance()->audioFilePathItem()->value().isEmpty() ) {
- TQString defAudioFile = KGlobal::dirs()->findResourceDir( "sound", "KDE-Sys-Warning.ogg");
+ TQString defAudioFile = TDEGlobal::dirs()->findResourceDir( "sound", "KDE-Sys-Warning.ogg");
KOPrefs::instance()->audioFilePathItem()->setValue( defAudioFile + "KDE-Sys-Warning.ogg" );
}
TQString filter = i18n( "*.ogg *.wav *.mp3 *.wma *.flac *.aiff *.raw *.au *.ra|"
@@ -374,7 +374,7 @@ class KOPrefsDialogTime : public KPrefsModule
TQHBox *workDaysBox = new TQHBox( workingHoursGroup );
// Respect start of week setting
- int weekStart=KGlobal::locale()->weekStartDay();
+ int weekStart=TDEGlobal::locale()->weekStartDay();
for ( int i = 0; i < 7; ++i ) {
const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem();
TQString weekDayName = calSys->weekDayName( (i + weekStart + 6)%7 + 1, true );
@@ -481,7 +481,7 @@ extern "C"
{
KCModule *create_korganizerconfigtime( TQWidget *parent, const char * )
{
- KGlobal::locale()->insertCatalogue( "timezones" );
+ TDEGlobal::locale()->insertCatalogue( "timezones" );
return new KOPrefsDialogTime( parent, "kcmkorganizertime" );
}
}
@@ -602,14 +602,14 @@ class KOPrefsDialogFonts : public KPrefsModule
KPrefsWidFont *timeBarFont =
addWidFont( KOPrefs::instance()->timeBarFontItem(), topFrame,
- KGlobal::locale()->formatTime( TQTime( 12, 34 ) ) );
+ TDEGlobal::locale()->formatTime( TQTime( 12, 34 ) ) );
topLayout->addWidget(timeBarFont->label(),0,0);
topLayout->addWidget(timeBarFont->preview(),0,1);
topLayout->addWidget(timeBarFont->button(),0,2);
KPrefsWidFont *monthViewFont =
addWidFont( KOPrefs::instance()->monthViewFontItem(), topFrame,
- KGlobal::locale()->formatTime(TQTime(12,34)) + " " +
+ TDEGlobal::locale()->formatTime(TQTime(12,34)) + " " +
i18n("Event text") );
topLayout->addWidget(monthViewFont->label(),1,0);
@@ -625,7 +625,7 @@ class KOPrefsDialogFonts : public KPrefsModule
KPrefsWidFont *marcusBainsFont =
addWidFont( KOPrefs::instance()->marcusBainsFontItem(), topFrame,
- KGlobal::locale()->formatTime( TQTime( 12, 34, 23 ) ) );
+ TDEGlobal::locale()->formatTime( TQTime( 12, 34, 23 ) ) );
topLayout->addWidget(marcusBainsFont->label(),3,0);
topLayout->addWidget(marcusBainsFont->preview(),3,1);
topLayout->addWidget(marcusBainsFont->button(),3,2);
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 9f711d609..8cac3182e 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -112,7 +112,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
connect( calendar, TQT_SIGNAL(calendarChanged()),
this, TQT_SLOT(slotCalendarChanged()) );
- KGlobal::iconLoader()->addAppDir( "tdepim" );
+ TDEGlobal::iconLoader()->addAppDir( "tdepim" );
setButtonOK( i18n( "Suspend" ) );
TQWidget *topBox = plainPage();
@@ -123,7 +123,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
topLayout->addWidget( label );
mSplitter = new TQSplitter( Qt::Vertical, topBox );
- mSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+ mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
topLayout->addWidget( mSplitter );
mIncidenceListView = new KListView( mSplitter );
@@ -505,9 +505,9 @@ void AlarmDialog::eventNotification()
if (alarm->type() == Alarm::Procedure) {
// FIXME: Add a message box asking whether the procedure should really be executed
kdDebug(5890) << "Starting program: '" << alarm->programFile() << "'" << endl;
- KProcess proc;
+ TDEProcess proc;
proc << TQFile::encodeName(alarm->programFile()).data();
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
else if (alarm->type() == Alarm::Audio) {
beeped = true;
@@ -693,7 +693,7 @@ TQDateTime AlarmDialog::triggerDateForIncidence( Incidence *incidence,
if ( incidence->doesRecur() ) {
result = incidence->recurrence()->getNextDateTime( reminderAt );
- displayStr = KGlobal::locale()->formatDateTime( result );
+ displayStr = TDEGlobal::locale()->formatDateTime( result );
}
if ( incidence->type() == "Event" ) {
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index aaeedd7fe..301f058a8 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -57,7 +57,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name )
setCaption( mName );
// Set up icons
- KGlobal::iconLoader()->addAppDir( "korgac" );
+ TDEGlobal::iconLoader()->addAppDir( "korgac" );
mPixmapEnabled = loadSizedIcon( "korgac", width() );
mPixmapDisabled = loadSizedIcon( "korgac_disabled", width() );
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index 5b3ee4e9a..a2eacaf0d 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -152,9 +152,9 @@ void KOAlarmClient::slotQuit()
void KOAlarmClient::saveLastCheckTime()
{
- KConfigGroup cg( KGlobal::config(), "Alarms");
+ KConfigGroup cg( TDEGlobal::config(), "Alarms");
cg.writeEntry( "CalendarsLastChecked", mLastChecked );
- KGlobal::config()->sync();
+ TDEGlobal::config()->sync();
}
void KOAlarmClient::quit()
diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp
index 8b9012387..afa7fe458 100644
--- a/korganizer/korgac/korgacmain.cpp
+++ b/korganizer/korgac/korgacmain.cpp
@@ -80,7 +80,7 @@ int main( int argc, char **argv )
MyApp app;
app.disableSessionManagement();
- KGlobal::locale()->insertCatalogue( "libkcal" );
+ TDEGlobal::locale()->insertCatalogue( "libkcal" );
return app.exec();
}
diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp
index 6067ca02a..dba9c2c8b 100644
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@@ -202,7 +202,7 @@ void KOrganizer::writeSettings()
void KOrganizer::initActions()
{
- setInstance( KGlobal::instance() );
+ setInstance( TDEGlobal::instance() );
setXMLFile( "korganizerui.rc" );
setStandardToolBarMenuEnabled( true );
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index b51a4f991..e43c06a8c 100644
--- a/korganizer/korganizer.h
+++ b/korganizer/korganizer.h
@@ -41,7 +41,7 @@ class KTempFile;
class KRecentFilesAction;
class KOWindowList;
class KToggleAction;
-class KProcess;
+class TDEProcess;
class KONewStuff;
class ActionManager;
class CalendarView;
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 4bea20a78..6886358f7 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -71,9 +71,9 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
const TQStringList & ) :
KParts::ReadOnlyPart(parent, name), mTopLevelWidget( parentWidget->topLevelWidget() )
{
- KGlobal::locale()->insertCatalogue( "libkcal" );
- KGlobal::locale()->insertCatalogue( "libtdepim" );
- KGlobal::locale()->insertCatalogue( "kdgantt" );
+ TDEGlobal::locale()->insertCatalogue( "libkcal" );
+ TDEGlobal::locale()->insertCatalogue( "libtdepim" );
+ TDEGlobal::locale()->insertCatalogue( "kdgantt" );
KOCore::self()->addXMLGUIClient( mTopLevelWidget, this );
@@ -140,7 +140,7 @@ TDEAboutData *KOrganizerPart::createAboutData()
return new KOrg::AboutData;
}
-void KOrganizerPart::startCompleted( KProcess *process )
+void KOrganizerPart::startCompleted( TDEProcess *process )
{
delete process;
}
diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h
index ff35d9baf..1596c4d85 100644
--- a/korganizer/korganizer_part.h
+++ b/korganizer/korganizer_part.h
@@ -33,7 +33,7 @@
class TDEInstance;
class TDEAboutData;
-class KProcess;
+class TDEProcess;
class CalendarView;
class ActionManager;
@@ -95,7 +95,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart,
virtual bool openFile();
protected slots:
- void startCompleted( KProcess * );
+ void startCompleted( TDEProcess * );
private:
CalendarView *mView;
diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp
index d47e360ee..a93c6d686 100644
--- a/korganizer/kotimelineview.cpp
+++ b/korganizer/kotimelineview.cpp
@@ -54,7 +54,7 @@ KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *parent,
mGantt->removeColumn( 0 );
mGantt->addColumn( i18n("Calendar") );
mGantt->setHeaderVisible( true );
- if ( KGlobal::locale()->use12Clock() )
+ if ( TDEGlobal::locale()->use12Clock() )
mGantt->setHourFormat( KDGanttView::Hour_12 );
else
mGantt->setHourFormat( KDGanttView::Hour_24_FourDigit );
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index e7fad7dae..1e13f8a6a 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -268,11 +268,11 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
int progress = (int)(( (width-6)*mTodo->percentComplete())/100.0 + 0.5);
p->fillRect( 0, 0, width, height(), _cg.base() ); // background
- p->setPen( KGlobalSettings::textColor() ); //border
- p->setBrush( KGlobalSettings::baseColor() ); //filling
+ p->setPen( TDEGlobalSettings::textColor() ); //border
+ p->setBrush( TDEGlobalSettings::baseColor() ); //filling
p->drawRect( 2, 2, width-4, height()-4);
p->fillRect( 3, 3, progress, height()-6,
- KGlobalSettings::highlightColor() );
+ TDEGlobalSettings::highlightColor() );
p->restore();
} else {
TQCheckListItem::paintCell(p, _cg, column, width, alignment);
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 6287890c8..14bae60c1 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -65,7 +65,7 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent,
: KOrg::BaseView(calendar, parent, name)
{
// TQLabel *dateLabel =
-// new TQLabel(KGlobal::locale()->formatDate(TQDate::currentDate()),this);
+// new TQLabel(TDEGlobal::locale()->formatDate(TQDate::currentDate()),this);
// dateLabel->setMargin(2);
// dateLabel->setAlignment(AlignCenter);
@@ -103,11 +103,11 @@ void KOWhatsNextView::updateView()
mText += "<h2>";
if ( mStartDate.daysTo( mEndDate ) < 1 ) {
- mText += KGlobal::locale()->formatDate( mStartDate );
+ mText += TDEGlobal::locale()->formatDate( mStartDate );
} else {
mText += i18n("Date from - to", "%1 - %2")
- .arg( KGlobal::locale()->formatDate( mStartDate ) )
- .arg( KGlobal::locale()->formatDate( mEndDate ) );
+ .arg( TDEGlobal::locale()->formatDate( mStartDate ) )
+ .arg( TDEGlobal::locale()->formatDate( mEndDate ) );
}
mText+="</h2>\n";
@@ -281,14 +281,14 @@ void KOWhatsNextView::appendEvent( Incidence *ev, const TQDateTime &start,
if ( starttime.date().daysTo( endtime.date() ) >= 1 ) {
mText += i18n("date from - to", "%1 - %2")
- .arg( KGlobal::locale()->formatDateTime( starttime ) )
- .arg( KGlobal::locale()->formatDateTime( endtime ) );
+ .arg( TDEGlobal::locale()->formatDateTime( starttime ) )
+ .arg( TDEGlobal::locale()->formatDateTime( endtime ) );
} else {
/*if (reply) */
mText += i18n("date, from - to", "%1, %2 - %3")
- .arg( KGlobal::locale()->formatDate( starttime.date(), true ) )
- .arg( KGlobal::locale()->formatTime( starttime.time() ) )
- .arg( KGlobal::locale()->formatTime( endtime.time() ) );
+ .arg( TDEGlobal::locale()->formatDate( starttime.date(), true ) )
+ .arg( TDEGlobal::locale()->formatTime( starttime.time() ) )
+ .arg( TDEGlobal::locale()->formatTime( endtime.time() ) );
}
}
// }
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 3f3357752..118b32643 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -47,9 +47,9 @@ int main ( int argc, char **argv )
KOrganizerApp app;
- KGlobal::locale()->insertCatalogue( "libkcal" );
- KGlobal::locale()->insertCatalogue( "libtdepim" );
- KGlobal::locale()->insertCatalogue( "kdgantt" );
+ TDEGlobal::locale()->insertCatalogue( "libkcal" );
+ TDEGlobal::locale()->insertCatalogue( "libtdepim" );
+ TDEGlobal::locale()->insertCatalogue( "kdgantt" );
if ( app.isRestored() ) {
RESTORE( KOrganizer )
diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index 7370f6f18..e76d36b50 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -58,7 +58,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
mLeftTopSpacer = new TQWidget( topSideBox );
mLeftTopSpacer->setFixedHeight( topLabelHeight );
mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox );
- mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+ mLeftSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter );
label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
TQVBox *sideBox = new TQVBox( mLeftSplitter );
@@ -82,7 +82,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
mRightTopSpacer = new TQWidget( topSideBox );
mRightTopSpacer->setFixedHeight( topLabelHeight );
mRightSplitter = new TQSplitter( Qt::Vertical, topSideBox );
- mRightSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+ mRightSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
new TQWidget( mRightSplitter );
sideBox = new TQVBox( mRightSplitter );
eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
@@ -461,7 +461,7 @@ bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event)
{
if ( obj->className() == TQCString(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) {
// KDE4: not needed anymore, TQSplitter has a moved signal there
- if ( (event->type() == TQEvent::MouseMove && KGlobalSettings::opaqueResize())
+ if ( (event->type() == TQEvent::MouseMove && TDEGlobalSettings::opaqueResize())
|| event->type() == TQEvent::MouseButtonRelease ) {
FOREACH_VIEW( agenda ) {
if ( TQT_BASE_OBJECT(agenda->splitter()) == TQT_BASE_OBJECT(obj->parent()) )
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index 063c6756e..ca3c4c497 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -49,7 +49,7 @@ class ExchangeFactory : public KOrg::PartFactory {
KOrg::Part *create(KOrg::MainWindow *parent, const char *name)
{
kdDebug(5850) << "Registering Exchange Plugin...\n";
- KGlobal::locale()->insertCatalogue("libkpimexchange");
+ TDEGlobal::locale()->insertCatalogue("libkpimexchange");
return new Exchange(parent,name);
}
};
diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp
index 6298151ac..54a118523 100644
--- a/korganizer/plugins/hebrew/configdialog.cpp
+++ b/korganizer/plugins/hebrew/configdialog.cpp
@@ -63,7 +63,7 @@ void ConfigDialog::load()
config.setGroup("Calendar/Hebrew Calendar Plugin");
israel_box->setChecked(config.
readBoolEntry("Israel",
- (KGlobal::locale()->
+ (TDEGlobal::locale()->
country() == ".il")));
parsha_box->setChecked(config.readBoolEntry("Parsha", true));
chol_box->setChecked(config.readBoolEntry("Chol_HaMoed", true));
diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp
index 8a9f37bd4..742c7849d 100644
--- a/korganizer/plugins/hebrew/hebrew.cpp
+++ b/korganizer/plugins/hebrew/hebrew.cpp
@@ -51,7 +51,7 @@ TQString Hebrew::shortText(const TQDate & date)
config.setGroup("Calendar/Hebrew Calendar Plugin");
IsraelP =
config.readBoolEntry("Israel",
- (KGlobal::locale()->country() == ".il"));
+ (TDEGlobal::locale()->country() == ".il"));
Holiday::ParshaP = config.readBoolEntry("Parsha", true);
Holiday::CholP = config.readBoolEntry("Chol_HaMoed", true);
Holiday::OmerP = config.readBoolEntry("Omer", true);
diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp
index 0c124bbeb..f22e1b17a 100644
--- a/korganizer/plugins/printing/year/yearprint.cpp
+++ b/korganizer/plugins/printing/year/yearprint.cpp
@@ -138,7 +138,7 @@ void CalPrintYear::setDateRange( const TQDate& from, const TQDate& to )
void CalPrintYear::print( TQPainter &p, int width, int height )
{
const KCalendarSystem *calsys = calendarSystem();
- KLocale *locale = KGlobal::locale();
+ KLocale *locale = TDEGlobal::locale();
if ( !calsys || !locale ) return;
TQRect headerBox( 0, 0, width, headerHeight() );
diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp
index 64cdd7a3f..da7d5f486 100644
--- a/korganizer/plugins/projectview/projectview.cpp
+++ b/korganizer/plugins/projectview/projectview.cpp
@@ -37,7 +37,7 @@ class ProjectViewFactory : public KOrg::PartFactory {
public:
KOrg::Part *create(KOrg::MainWindow *parent, const char *name)
{
- KGlobal::locale()->insertCatalogue( "kgantt" );
+ TDEGlobal::locale()->insertCatalogue( "kgantt" );
return new ProjectView(parent,name);
}
};
diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index caa2e69ef..e67015545 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -298,7 +298,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
exceptString = i18n("except for listed dates", " except");
for ( uint i = 0; i < recurs->exDates().size(); i++ ) {
exceptString.append(" ");
- exceptString.append( KGlobal::locale()->formatDate(recurs->exDates()[i],
+ exceptString.append( TDEGlobal::locale()->formatDate(recurs->exDates()[i],
true) );
}
}
@@ -482,24 +482,24 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
if ( (*rit)->dtStart().isValid() ) {
datesString += i18n(
"Start Date: %1\n").arg(
- KGlobal::locale()->formatDate( (*rit)->dtStart().date(),
+ TDEGlobal::locale()->formatDate( (*rit)->dtStart().date(),
true ) );
if ( !(*rit)->doesFloat() ) {
datesString += i18n(
"Start Time: %1\n").arg(
- KGlobal::locale()->formatTime((*rit)->dtStart().time(),
+ TDEGlobal::locale()->formatTime((*rit)->dtStart().time(),
false, false) );
}
}
if ( (*rit)->dtEnd().isValid() ) {
subitemString += i18n(
"Due Date: %1\n").arg(
- KGlobal::locale()->formatDate( (*rit)->dtEnd().date(),
+ TDEGlobal::locale()->formatDate( (*rit)->dtEnd().date(),
true ) );
if ( !(*rit)->doesFloat() ) {
subitemString += i18n(
"subitem due time", "Due Time: %1\n").arg(
- KGlobal::locale()->formatTime((*rit)->dtEnd().time(),
+ TDEGlobal::locale()->formatTime((*rit)->dtEnd().time(),
false, false) );
}
}
@@ -705,7 +705,7 @@ void CalPrintDay::print( TQPainter &p, int width, int height )
TQRect footerBox( 0, height - footerHeight(), width, footerHeight() );
height -= footerHeight();
- KLocale *local = KGlobal::locale();
+ KLocale *local = TDEGlobal::locale();
do {
TQTime curStartTime( mStartTime );
@@ -915,7 +915,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height )
toWeek = mToDate.addDays( 6 - weekdayCol );
curWeek = fromWeek.addDays( 6 );
- KLocale *local = KGlobal::locale();
+ KLocale *local = TDEGlobal::locale();
TQString line1, line2, title;
TQRect headerBox( 0, 0, width, headerHeight() );
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 99d57395e..50436228b 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -558,7 +558,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox )
TQFont oldfont( p.font() );
p.setFont( TQFont( "sans-serif", 6 ) );
TQFontMetrics fm( p.font() );
- TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false );
+ TQString dateStr = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false );
p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine,
i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) );
p.setFont( oldfont );
@@ -690,7 +690,7 @@ void CalPrintPluginBase::drawTimeLine( TQPainter &p, const TQTime &fromTime,
if ( newY < box.bottom() ) {
TQFont oldFont( p.font() );
// draw the time:
- if ( !KGlobal::locale()->use12Clock() ) {
+ if ( !TDEGlobal::locale()->use12Clock() ) {
p.drawLine( xcenter, (int)newY, box.right(), (int)newY );
numStr.setNum( curTime.hour() );
if ( cellHeight > 30 ) {
@@ -706,7 +706,7 @@ void CalPrintPluginBase::drawTimeLine( TQPainter &p, const TQTime &fromTime,
} else {
p.drawLine( box.left(), (int)newY, box.right(), (int)newY );
TQTime time( curTime.hour(), 0 );
- numStr = KGlobal::locale()->formatTime( time );
+ numStr = TDEGlobal::locale()->formatTime( time );
if ( box.width() < 60 ) {
p.setFont( TQFont( "sans-serif", 7, TQFont::Bold ) ); // for weekprint
} else {
@@ -906,14 +906,14 @@ void CalPrintPluginBase::drawAgendaItem( PrintCellItem *item, TQPainter &p,
if ( event->location().isEmpty() ) {
str = i18n( "starttime - endtime summary",
"%1-%2 %3" ).
- arg( KGlobal::locale()->formatTime( startTime.time() ) ).
- arg( KGlobal::locale()->formatTime( endTime.time() ) ).
+ arg( TDEGlobal::locale()->formatTime( startTime.time() ) ).
+ arg( TDEGlobal::locale()->formatTime( endTime.time() ) ).
arg( cleanStr( event->summary() ) );
} else {
str = i18n( "starttime - endtime summary, location",
"%1-%2 %3, %4" ).
- arg( KGlobal::locale()->formatTime( startTime.time() ) ).
- arg( KGlobal::locale()->formatTime( endTime.time() ) ).
+ arg( TDEGlobal::locale()->formatTime( startTime.time() ) ).
+ arg( TDEGlobal::locale()->formatTime( endTime.time() ) ).
arg( cleanStr( event->summary() ) ).
arg( cleanStr( event->location() ) );
}
@@ -927,7 +927,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
bool fullDate, bool printRecurDaily, bool printRecurWeekly )
{
TQString dayNumStr;
- const KLocale*local = KGlobal::locale();
+ const KLocale*local = TDEGlobal::locale();
// This has to be localized
if ( fullDate && mCalSys ) {
@@ -1001,7 +1001,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
continue;
}
if ( todo->hasStartDate() && !todo->doesFloat() ) {
- timeText = KGlobal::locale()->formatTime( todo->dtStart().time() ) + " ";
+ timeText = TDEGlobal::locale()->formatTime( todo->dtStart().time() ) + " ";
} else {
timeText = "";
}
@@ -1017,11 +1017,11 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
if ( !todo->doesFloat() ) {
str = i18n( "%1 (Due: %2)" ).
arg( summaryStr ).
- arg( KGlobal::locale()->formatDateTime( todo->dtDue() ) );
+ arg( TDEGlobal::locale()->formatDateTime( todo->dtDue() ) );
} else {
str = i18n( "%1 (Due: %2)" ).
arg( summaryStr ).
- arg( KGlobal::locale()->formatDate( todo->dtDue().date(), true ) );
+ arg( TDEGlobal::locale()->formatDate( todo->dtDue().date(), true ) );
}
} else {
str = summaryStr;
@@ -1423,7 +1423,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
TodoParentStart *r )
{
TQString outStr;
- const KLocale *local = KGlobal::locale();
+ const KLocale *local = TDEGlobal::locale();
TQRect rect;
TodoParentStart startpt;
@@ -1640,7 +1640,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
int CalPrintPluginBase::weekdayColumn( int weekday )
{
- return ( weekday + 7 - KGlobal::locale()->weekStartDay() ) % 7;
+ return ( weekday + 7 - TDEGlobal::locale()->weekStartDay() ) % 7;
}
void CalPrintPluginBase::drawJournalField( TQPainter &p, TQString field, TQString text,
@@ -1670,7 +1670,7 @@ void CalPrintPluginBase::drawJournal( Journal * journal, TQPainter &p, int x, in
TQFont oldFont( p.font() );
p.setFont( TQFont( "sans-serif", 15 ) );
TQString headerText;
- TQString dateText( KGlobal::locale()->
+ TQString dateText( TDEGlobal::locale()->
formatDate( journal->dtStart().date(), false ) );
if ( journal->summary().isEmpty() ) {
diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp
index 38c587289..0d554edd4 100644
--- a/korganizer/timelabels.cpp
+++ b/korganizer/timelabels.cpp
@@ -112,7 +112,7 @@ void TimeLabels::drawContents(TQPainter *p,int cx, int cy, int cw, int ch)
TQFont nFont = font();
p->setFont( font() );
- if (!KGlobal::locale()->use12Clock()) {
+ if (!TDEGlobal::locale()->use12Clock()) {
suffix = "00";
} else
if (cell > 11) suffix = "pm";
@@ -144,7 +144,7 @@ void TimeLabels::drawContents(TQPainter *p,int cx, int cy, int cw, int ch)
p->drawLine( cx, int(y), cw+2, int(y) );
hour.setNum(cell);
// handle 24h and am/pm time formats
- if (KGlobal::locale()->use12Clock()) {
+ if (TDEGlobal::locale()->use12Clock()) {
if (cell == 12) suffix = "pm";
if (cell == 0) hour.setNum(12);
if (cell > 12) hour.setNum(cell - 12);
@@ -185,10 +185,10 @@ void TimeLabels::updateConfig()
setFont(KOPrefs::instance()->mTimeBarFont);
TQString test = "20";
- if ( KGlobal::locale()->use12Clock() )
+ if ( TDEGlobal::locale()->use12Clock() )
test = "12";
mMiniWidth = fontMetrics().width( test );
- if ( KGlobal::locale()->use12Clock() )
+ if ( TDEGlobal::locale()->use12Clock() )
test = "pm";
else {
test = "00";
diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp
index a8ef22339..73891c2d6 100644
--- a/korganizer/timezone.cpp
+++ b/korganizer/timezone.cpp
@@ -59,5 +59,5 @@ int main(int argc,char **argv)
<< qtime.toString( TQt::ISODate ) << endl;
kdDebug(5850) << "KLocale::formatTime(): "
- << KGlobal::locale()->formatTime( qtime ) << endl;
+ << TDEGlobal::locale()->formatTime( qtime ) << endl;
}
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index 6b454e63b..6e4819a8a 100644
--- a/korganizer/urihandler.cpp
+++ b/korganizer/urihandler.cpp
@@ -117,9 +117,9 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri )
// KaddressBook is not already running.
// Pass it the UID of the contact via the command line while starting it - its neater.
// We start it without its main interface
- TQString iconPath = KGlobal::iconLoader()->iconPath( "go", KIcon::Small );
+ TQString iconPath = TDEGlobal::iconLoader()->iconPath( "go", KIcon::Small );
TQString tmpStr = "kaddressbook --editor-only --uid ";
- tmpStr += KProcess::quote( uid );
+ tmpStr += TDEProcess::quote( uid );
KRun::runCommand( tmpStr, "KAddressBook", iconPath );
return true;
}