From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- knotes/knote.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'knotes/knote.cpp') diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 72a75152..b68a342f 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -98,7 +98,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // (KOrganizer's journals don't have titles but a valid start date) if ( m_journal->summary().isNull() && m_journal->dtStart().isValid() ) { - TQString s = KGlobal::locale()->formatDateTime( m_journal->dtStart() ); + TQString s = TDEGlobal::locale()->formatDateTime( m_journal->dtStart() ); m_journal->setSummary( s ); } @@ -214,7 +214,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * m_editor->cornerWidget()->setBackgroundMode( PaletteBase ); // the config file location - TQString configFile = KGlobal::dirs()->saveLocation( "appdata", "notes/" ); + TQString configFile = TDEGlobal::dirs()->saveLocation( "appdata", "notes/" ); configFile += m_journal->uid(); // no config file yet? -> use the default display config if available @@ -407,7 +407,7 @@ void KNote::slotKill( bool force ) delete m_config; m_config = 0; - TQString configFile = KGlobal::dirs()->saveLocation( "appdata", "notes/" ); + TQString configFile = TDEGlobal::dirs()->saveLocation( "appdata", "notes/" ); configFile += m_journal->uid(); if ( !KIO::NetAccess::del( KURL::fromPathOrURL( configFile ), this ) ) @@ -769,7 +769,7 @@ void KNote::slotClose() void KNote::slotInsDate() { - m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()) ); + m_editor->insert( TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()) ); } void KNote::slotSetAlarm() @@ -827,7 +827,7 @@ void KNote::slotMail() // get the mail action command const TQStringList cmd_list = TQStringList::split( TQChar(' '), KNotesGlobalConfig::mailAction() ); - KProcess mail; + TDEProcess mail; for ( TQStringList::ConstIterator it = cmd_list.constBegin(); it != cmd_list.constEnd(); ++it ) { @@ -839,7 +839,7 @@ void KNote::slotMail() mail << (*it).local8Bit(); } - if ( !mail.start( KProcess::DontCare ) ) + if ( !mail.start( TDEProcess::DontCare ) ) KMessageBox::sorry( this, i18n("Unable to start the mail process.") ); } -- cgit v1.2.3