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

List:       knode-devel
Subject:    [Knode-devel] KDE/kdepim
From:       Eduardo Robles Elvira <edulix () gmail ! com>
Date:       2008-03-29 12:05:47
Message-ID: 1206792347.064956.31262.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 791398 by edulix:

Remove checks for Qt 4.4 as its use is mandatory in trunk



 M  +0 -4      kalarm/birthdaydlg.cpp  
 M  +0 -4      kmail/searchwindow.cpp  
 M  +0 -4      knode/knarticlewindow.cpp  
 M  +0 -4      knode/knmainwidget.cpp  
 M  +0 -4      knotes/knote.cpp  


--- trunk/KDE/kdepim/kalarm/birthdaydlg.cpp #791397:791398
@@ -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
 }
--- trunk/KDE/kdepim/kmail/searchwindow.cpp #791397:791398
@@ -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
 }
 
 //-----------------------------------------------------------------------------
--- trunk/KDE/kdepim/knode/knarticlewindow.cpp #791397:791398
@@ -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
 }
 
 
--- trunk/KDE/kdepim/knode/knmainwidget.cpp #791397:791398
@@ -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()
--- trunk/KDE/kdepim/knotes/knote.cpp #791397:791398
@@ -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()
_______________________________________________
Knode-devel mailing list
Knode-devel@kde.org
https://mail.kde.org/mailman/listinfo/knode-devel
[prev in list] [next in list] [prev in thread] [next in thread]