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

List:       kde-commits
Subject:    KDE/kdegraphics/okular/ui
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2010-11-21 17:37:08
Message-ID: 20101121173708.17511AC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199360 by aacid:

build with 4.5 libs


 M  +6 -1      pageview.cpp  


--- trunk/KDE/kdegraphics/okular/ui/pageview.cpp #1199359:1199360
@@ -43,6 +43,7 @@
 #include <kselectaction.h>
 #include <ktoggleaction.h>
 #include <kdebug.h>
+#include <kdeversion.h>
 #include <kmessagebox.h>
 #include <kicon.h>
 #include <kurifilter.h>
@@ -2922,6 +2923,7 @@
 
 void PageView::addWebShortcutsMenu( KMenu * menu, const QString & text )
 {
+#if KDE_IS_VERSION(4,5,70)
     if ( text.isEmpty() )
     {
         return;
@@ -2972,6 +2974,7 @@
             menu->addMenu(webShortcutsMenu);
         }
     }
+#endif
 }
 
 //BEGIN private SLOTS
@@ -3268,7 +3271,7 @@
             // add the page after the 'visible series' in preload
             int tailRequest = d->visibleItems.last()->pageNumber() + j;
             if ( tailRequest < (int)d->items.count() )
-            {
+            {
                 PageViewItem * i = d->items[ tailRequest ];
                 // request the pixmap if not already present
                 if ( !i->page()->hasPixmap( PAGEVIEW_ID, i->uncroppedWidth(), \
i->uncroppedHeight() ) && i->uncroppedWidth() > 0 ) @@ -3384,6 +3387,7 @@
 
 void PageView::slotHandleWebShortcutAction()
 {
+#if KDE_IS_VERSION(4,5,70)
     KAction *action = qobject_cast<KAction*>( sender() );
 
     if (action)
@@ -3395,6 +3399,7 @@
             KToolInvocation::invokeBrowser( filterData.uri().url() );
         }
     }
+#endif
 }
 
 void PageView::slotConfigureWebShortcuts()


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

Configure | About | News | Add a list | Sponsored by KoreLogic