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

List:       kde-commits
Subject:    KDE/kdegraphics/kpdf
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2005-10-03 22:09:34
Message-ID: 1128377374.565838.15786.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 466997 by aacid:

Some porting to new kdelibs snapshot


 M  +2 -2      conf/dlggeneral.ui.h  
 M  +3 -2      core/document.cpp  
 M  +2 -2      core/generator_pdf/generator_pdf.cpp  
 M  +2 -2      ui/pageview.cpp  


--- trunk/KDE/kdegraphics/kpdf/conf/dlggeneral.ui.h #466996:466997
@@ -10,7 +10,7 @@
 ** destructor.
 *****************************************************************************/
 
-#include <kapplication.h>
+#include <kauthorized.h>
 
 #include <config.h>
 
@@ -19,7 +19,7 @@
 #if KPDF_FORCE_DRM
     kcfg_ObeyDRM->hide();
 #else
-    if (kapp->authorize("skip_drm")) kcfg_ObeyDRM->show();
+    if (KAuthorized::authorize("skip_drm")) kcfg_ObeyDRM->show();
     else kcfg_ObeyDRM->hide();
 #endif
 }
--- trunk/KDE/kdegraphics/kpdf/core/document.cpp #466996:466997
@@ -9,6 +9,7 @@
  ***************************************************************************/
 
 // qt/kde/system includes
+#include <qapplication.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
@@ -23,7 +24,7 @@
 #include <klocale.h>
 #include <kfinddialog.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <ktoolinvocation.h>
 #include <kuserprofile.h>
 #include <krun.h>
 #include <kstandarddirs.h>
@@ -1048,7 +1049,7 @@
             const KPDFLinkBrowse * browse = static_cast< const KPDFLinkBrowse * >( link );
             // if the url is a mailto one, invoke mailer
             if ( browse->url().startsWith( "mailto:", false ) )
-                kapp->invokeMailer( browse->url() );
+                KToolInvocation::invokeMailer( browse->url() );
             else
             {
                 QString url = browse->url();
--- trunk/KDE/kdegraphics/kpdf/core/generator_pdf/generator_pdf.cpp #466996:466997
@@ -15,7 +15,7 @@
 #include <qapplication.h>
 #include <q3paintdevicemetrics.h>
 #include <qregexp.h>
-#include <kapplication.h>
+#include <kauthorized.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kpassdlg.h>
@@ -257,7 +257,7 @@
 bool PDFGenerator::isAllowed( int permissions )
 {
 #if !KPDF_FORCE_DRM
-    if (kapp->authorize("skip_drm") && !KpdfSettings::obeyDRM()) return true;
+    if (KAuthorized::authorize("skip_drm") && !KpdfSettings::obeyDRM()) return true;
 #endif
 
     bool b = true;
--- trunk/KDE/kdegraphics/kpdf/ui/pageview.cpp #466996:466997
@@ -36,7 +36,7 @@
 #include <kfiledialog.h>
 #include <kimageeffect.h>
 #include <kimageio.h>
-#include <kapplication.h>
+#include <ktoolinvocation.h>
 #include <kdebug.h>
 
 // system includes
@@ -1094,7 +1094,7 @@
                     if (!client->isApplicationRegistered("kttsd"))
                     {
                         QString error;
-                        if (KApplication::startServiceByDesktopName("kttsd", QStringList(), &error))
+                        if (KToolInvocation::startServiceByDesktopName("kttsd", QStringList(), &error))
                         {
                             d->messageWindow->display( i18n("Starting KTTSD Failed: %1").arg(error) );
                             KpdfSettings::setUseKTTSD(false);
[prev in list] [next in list] [prev in thread] [next in thread]