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 ++++++------ knotes/knotebutton.cpp | 2 +- knotes/knoteconfig.kcfg | 4 ++-- knotes/knotesapp.cpp | 8 ++++---- knotes/knotesapp.h | 4 ++-- knotes/knoteslegacy.cpp | 6 +++--- knotes/knotesnetrecv.cpp | 2 +- knotes/resourcelocal.cpp | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'knotes') diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 72a751526..b68a342f3 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.") ); } diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index 0c7862b2e..d3e571c02 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -39,7 +39,7 @@ KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *na m_flat = true; if ( !icon.isEmpty() ) - setIconSet( KGlobal::iconLoader()->loadIconSet( icon, KIcon::Small, 10 ) ); + setIconSet( TDEGlobal::iconLoader()->loadIconSet( icon, KIcon::Small, 10 ) ); } KNoteButton::~KNoteButton() diff --git a/knotes/knoteconfig.kcfg b/knotes/knoteconfig.kcfg index c6449eec6..09cd64dd2 100644 --- a/knotes/knoteconfig.kcfg +++ b/knotes/knoteconfig.kcfg @@ -25,11 +25,11 @@ - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() - KGlobalSettings::windowTitleFont() + TDEGlobalSettings::windowTitleFont() diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 25a57a42c..9df09cf3f 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -60,7 +60,7 @@ using namespace KNetwork; class KNotesKeyDialog : public KDialogBase { public: - KNotesKeyDialog( KGlobalAccel *globals, TQWidget *parent, const char* name = 0 ) + KNotesKeyDialog( TDEGlobalAccel *globals, TQWidget *parent, const char* name = 0 ) : KDialogBase( parent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok ) { m_keyChooser = new KKeyChooser( globals, this ); @@ -147,7 +147,7 @@ KNotesApp::KNotesApp() m_noteGUI.setContent( doc ); // create accels for global shortcuts - m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this), "global accel" ); + m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this), "global accel" ); m_globalAccel->insert( "global_new_note", i18n("New Note"), "", ALT+SHIFT+Key_N, ALT+SHIFT+Key_N , TQT_TQOBJECT(this), TQT_SLOT(newNote()), true, true ); @@ -163,7 +163,7 @@ KNotesApp::KNotesApp() m_globalAccel->readSettings(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Global Keybindings" ); m_globalAccel->setEnabled( config->readBoolEntry( "Enabled", true ) ); @@ -253,7 +253,7 @@ TQString KNotesApp::newNote( const TQString& name, const TQString& text ) if ( !name.isEmpty() ) journal->setSummary( name ); else - journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + journal->setSummary( TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); // the body of the note journal->setDescription( text ); diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h index 9ec90442f..66a3eea49 100644 --- a/knotes/knotesapp.h +++ b/knotes/knotesapp.h @@ -37,7 +37,7 @@ class KNote; class KPopupMenu; class KAction; class KActionMenu; -class KGlobalAccel; +class TDEGlobalAccel; class KXMLGUIFactory; class KXMLGUIBuilder; class KNotesAlarm; @@ -156,7 +156,7 @@ private: KPopupMenu *m_note_menu; KPopupMenu *m_context_menu; - KGlobalAccel *m_globalAccel; + TDEGlobalAccel *m_globalAccel; KXMLGUIFactory *m_guiFactory; KXMLGUIBuilder *m_guiBuilder; diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index 006e35cdf..c7e79172f 100644 --- a/knotes/knoteslegacy.cpp +++ b/knotes/knoteslegacy.cpp @@ -50,7 +50,7 @@ using namespace KCal; void KNotesLegacy::cleanUp() { // remove old (KDE 1.x) local config file if it still exists - TQString configfile = KGlobal::dirs()->saveLocation( "config" ) + "knotesrc"; + TQString configfile = TDEGlobal::dirs()->saveLocation( "config" ) + "knotesrc"; if ( TQFile::exists( configfile ) ) { KSimpleConfig *test = new KSimpleConfig( configfile ); test->setGroup( "General" ); @@ -71,7 +71,7 @@ bool KNotesLegacy::convert( CalendarLocal *calendar ) { bool converted = false; - TQDir noteDir( KGlobal::dirs()->saveLocation( "appdata", "notes/" ) ); + TQDir noteDir( TDEGlobal::dirs()->saveLocation( "appdata", "notes/" ) ); const TQStringList notes = noteDir.entryList( TQDir::Files, TQDir::Name ); for ( TQStringList::ConstIterator note = notes.constBegin(); note != notes.constEnd(); ++note ) { @@ -147,7 +147,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir, // set the defaults KIO::NetAccess::copy( - KURL( KGlobal::dirs()->saveLocation( "config" ) + "knotesrc" ), + KURL( TDEGlobal::dirs()->saveLocation( "config" ) + "knotesrc" ), KURL( configFile ), 0 ); diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp index 2c683dd64..a843c47bf 100644 --- a/knotes/knotesnetrecv.cpp +++ b/knotes/knotesnetrecv.cpp @@ -61,7 +61,7 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( KBufferedSocket *s ) : TQObject(), m_buffer( new TQByteArray() ), m_sock( s ) { - TQString date = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, false ); + TQString date = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, false ); // Add the remote IP or hostname and the date to the title, to help the // user guess who wrote it. diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp index 53ea68ac8..440b1454c 100644 --- a/knotes/resourcelocal.cpp +++ b/knotes/resourcelocal.cpp @@ -49,7 +49,7 @@ ResourceLocal::ResourceLocal( const KConfig *config ) { kdDebug(5500) << "ResourceLocal::ResourceLocal()" << endl; setType( "file" ); - mURL = KGlobal::dirs()->saveLocation( "data", "knotes/" ) + "notes.ics"; + mURL = TDEGlobal::dirs()->saveLocation( "data", "knotes/" ) + "notes.ics"; if ( config ) { -- cgit v1.2.1