diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /korganizer/actionmanager.cpp | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/actionmanager.cpp')
| -rw-r--r-- | korganizer/actionmanager.cpp | 14 |
1 files changed, 7 insertions, 7 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) |