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/knotesapp.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'knotes/knotesapp.cpp') 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 ); -- cgit v1.2.1