[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/kate
From:       Hamish Rodda <rodda () kde ! org>
Date:       2007-12-03 15:28:49
Message-ID: 1196695729.683246.30637.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 744426 by rodda:

KActionCollection::associateWidget -> addAssociatedWidget


 M  +8 -1      app/katemdi.cpp  
 M  +8 -1      plugins/filebrowser/katefileselector.cpp  


--- trunk/KDE/kdesdk/kate/app/katemdi.cpp #744425:744426
@@ -37,6 +37,7 @@
 #include <kmessagebox.h>
 #include <kvbox.h>
 #include <kxmlguifactory.h>
+#include <kdeversion.h>
 
 #include <QVBoxLayout>
 #include <QEvent>
@@ -137,7 +138,13 @@
     actionCollection()->setConfigGroup( "Shortcuts" );
     actionCollection()->readSettings();
 
-    actionCollection()->associateWidget(m_mw);
+    actionCollection()->addAssociatedWidget(m_mw);
+    foreach (QAction* action, actionCollection()->actions())
+#if QT_VERSION < KDE_MAKE_VERSION(4,4,0)
+      action->setShortcutContext(Qt::WidgetShortcut); // remove after Qt4.4 becomes \
mandatory +#else
+      action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+#endif
   }
 
   GUIClient::~GUIClient()
--- trunk/KDE/kdesdk/kate/plugins/filebrowser/katefileselector.cpp #744425:744426
@@ -71,6 +71,7 @@
 #include <ktexteditor/view.h>
 #include <kconfiggroup.h>
 #include <khistorycombobox.h>
+#include <kdeversion.h>
 //END Includes
 
 K_EXPORT_COMPONENT_FACTORY( katefilebrowserplugin, \
KGenericFactory<KateFileSelectorPlugin>( "katefilebrowserplugin" ) ) @@ -265,7 \
+266,13 @@  
   readConfig();
 
-  mActionCollection->associateWidget(this);
+  mActionCollection->addAssociatedWidget(this);
+  foreach (QAction* action, mActionCollection->actions())
+#if QT_VERSION < KDE_MAKE_VERSION(4,4,0)
+    action->setShortcutContext(Qt::WidgetShortcut); // remove after Qt4.4 becomes \
mandatory +#else
+    action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+#endif
 }
 
 KateFileSelector::~KateFileSelector()


[prev in list] [next in list] [prev in thread] [next in thread]