From 29df04c24350cc76a41e2410d1c92445f9338b98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- quanta/dialogs/actionconfigdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'quanta/dialogs/actionconfigdialog.cpp') diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index 29cabe4e..7ae6b4a4 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -152,7 +152,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQT_SLOT(slotEditToolbar())); - globalShortcuts = KGlobal::config()->entryMap( "Global Shortcuts" ); + globalShortcuts = TDEGlobal::config()->entryMap( "Global Shortcuts" ); } ActionConfigDialog::~ActionConfigDialog() -- cgit v1.2.1