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

List:       kde-core-devel
Subject:    Re: Shortcuts / konsolepart conflict
From:       Eduardo Robles Elvira <edulix () gmail ! com>
Date:       2008-03-29 10:07:59
Message-ID: 200803291108.04031.edulix () gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


El Sábado 29 Marzo 2008, escribió:
> El Sábado 29 Marzo 2008, Yo mismo escribí:
> > BTW this reminds me that Hamish Rodda commited a lot of preprocessor
> > rules that checked if Qt 4.4 was available or not to use
> > WidgetWithChildrenShortcut or not, and all that code is not necessary
> > anymore as Qt 4.4 is mandatory. Some apps as konsole have already removed
> > it, but many haven't yet. Developers be aware! :P
> >
> > Greetings,
> >       Eduardo Robles Elvira.
>
> Attached is the mentioned patch for kdelibs. Should I commit?

Okey.. these are some other patches for all the other places where I've found 
the Qt 4.4 check. Should I commit? =)
-- 
"The reasonable man adapts himself to the world; the unreasonable one
persists in trying to adapt the world to himself. Therefore all progress
depends on the unreasonable man." (George Bernard Shaw)

["kde-multimedia-remove-qt44-checks.patch" (text/x-diff)]

Index: juk/juk.cpp
===================================================================
--- juk/juk.cpp	(revisión: 772964)
+++ juk/juk.cpp	(copia de trabajo)
@@ -278,11 +278,7 @@
 
     ActionCollection::actions()->addAssociatedWidget(this);
     foreach (QAction* action, ActionCollection::actions()->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
 }
 
 void JuK::setupSystemTray()

["kdepim-remove-qt44-checks.patch" (text/x-diff)]

Index: kmail/searchwindow.cpp
===================================================================
--- kmail/searchwindow.cpp	(revisión: 788800)
+++ kmail/searchwindow.cpp	(copia de trabajo)
@@ -348,11 +348,7 @@
 
   ac->addAssociatedWidget( this );
   foreach (QAction* action, ac->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
 }
 
 //-----------------------------------------------------------------------------
Index: knode/knmainwidget.cpp
===================================================================
--- knode/knmainwidget.cpp	(revisión: 788800)
+++ knode/knmainwidget.cpp	(copia de trabajo)
@@ -238,11 +238,7 @@
 
   actionCollection()->addAssociatedWidget( this );
   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
 }
 
 KNMainWidget::~KNMainWidget()
Index: knode/knarticlewindow.cpp
===================================================================
--- knode/knarticlewindow.cpp	(revisión: 788800)
+++ knode/knarticlewindow.cpp	(copia de trabajo)
@@ -121,11 +121,7 @@
   // this will enable keyboard-only actions like that don't appear in any menu
   actionCollection()->addAssociatedWidget( this );
   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
 }
 
 
Index: kalarm/birthdaydlg.cpp
===================================================================
--- kalarm/birthdaydlg.cpp	(revisión: 788800)
+++ kalarm/birthdaydlg.cpp	(copia de trabajo)
@@ -215,11 +215,7 @@
 	KStandardAction::deselect(mListView, SLOT(clearSelection()), actions);
 	actions->addAssociatedWidget(mListView);
     foreach (QAction* action, actions->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
 
 	enableButtonOk(false);     // only enable OK button when something is selected
 }
Index: knotes/knote.cpp
===================================================================
--- knotes/knote.cpp	(revisión: 788800)
+++ knotes/knote.cpp	(copia de trabajo)
@@ -680,11 +680,7 @@
 
   actionCollection()->addAssociatedWidget( this );
   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
 }
 
 void KNote::createNoteHeader()

["kdesdk-remove-qt44-checks.patch" (text/x-diff)]

Index: kate/app/katemdi.cpp
===================================================================
--- kate/app/katemdi.cpp	(revisión: 788800)
+++ kate/app/katemdi.cpp	(copia de trabajo)
@@ -138,11 +138,7 @@
 
     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()
Index: kate/plugins/filebrowser/katefileselector.cpp
===================================================================
--- kate/plugins/filebrowser/katefileselector.cpp	(revisión: 788800)
+++ kate/plugins/filebrowser/katefileselector.cpp	(copia de trabajo)
@@ -262,11 +262,7 @@
 
   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()

["signature.asc" (application/pgp-signature)]

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