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 /knotes/knotesapp.h | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'knotes/knotesapp.h')
-rw-r--r-- | knotes/knotesapp.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; |