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

List:       kde-commits
Subject:    branches/KDE/4.3/kdegraphics/okular
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2009-10-26 21:04:09
Message-ID: 1256591049.881298.31113.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1040791 by aacid:

SVN commit 1040789 by aacid:

using Part as class name makes it very easy to collide with other Parts out there and \
very ugly things will happen, add a namespace


 M  +4 -0      extensions.cpp  
 M  +6 -0      extensions.h  
 M  +10 -6     part.cpp  
 M  +3 -2      part.h  


--- branches/KDE/4.3/kdegraphics/okular/extensions.cpp #1040790:1040791
@@ -13,6 +13,9 @@
 // local includes
 #include "part.h"
 
+namespace Okular
+{
+
 /*
  * BrowserExtension class
  */
@@ -114,6 +117,7 @@
           "{ this.messageHandler.onMessage(" + arrayarg + ") }" );
 }
 
+}
 
 #include "extensions.moc"
 
--- branches/KDE/4.3/kdegraphics/okular/extensions.h #1040790:1040791
@@ -13,6 +13,9 @@
 
 #include <kparts/browserextension.h>
 
+namespace Okular
+{
+
 class Part;
 
 class BrowserExtension : public KParts::BrowserExtension
@@ -51,6 +54,9 @@
         bool m_inEval;
         QString m_evalRes;
 };
+
+}
+
 #endif
 
 /* kate: replace-tabs on; indent-width 4; */
--- branches/KDE/4.3/kdegraphics/okular/part.cpp #1040790:1040791
@@ -143,7 +143,7 @@
         std::FILE * m_handle;
 };
 
-K_PLUGIN_FACTORY( okularPartFactory, registerPlugin< Part >(); )
+K_PLUGIN_FACTORY( okularPartFactory, registerPlugin< Okular::Part >(); )
 K_EXPORT_PLUGIN( okularPartFactory( okularAboutData( "okular", I18N_NOOP( "Okular" ) \
) ) )  
 static QAction* actionForExportFormat( const Okular::ExportFormat& format, QObject \
*parent = 0 ) @@ -183,29 +183,29 @@
     return QString();
 }
 
-static Part::EmbedMode detectEmbedMode( QWidget *parentWidget, QObject *parent, \
const QVariantList &args ) +static Okular::Part::EmbedMode detectEmbedMode( QWidget \
*parentWidget, QObject *parent, const QVariantList &args )  {
     Q_UNUSED( parentWidget );
 
     if ( parent
          && ( parent->objectName() == QLatin1String( "okular::Shell" )
               || parent->objectName() == QLatin1String( "okular/okular__Shell" ) ) )
-        return Part::NativeShellMode;
+        return Okular::Part::NativeShellMode;
 
     if ( parent
          && ( QByteArray( "KHTMLPart" ) == parent->metaObject()->className() ) )
-        return Part::KHTMLPartMode;
+        return Okular::Part::KHTMLPartMode;
 
     Q_FOREACH ( const QVariant &arg, args )
     {
         if ( arg.type() == QVariant::String )
         {
             if ( arg.toString() == QLatin1String( "Print/Preview" ) )
-                return Part::PrintPreviewMode;
+                return Okular::Part::PrintPreviewMode;
         }
     }
 
-    return Part::UnknownEmbedMode;
+    return Okular::Part::UnknownEmbedMode;
 }
 
 #undef OKULAR_KEEP_FILE_OPEN
@@ -218,6 +218,9 @@
 }
 #endif
 
+namespace Okular
+{
+
 Part::Part(QWidget *parentWidget,
 QObject *parent,
 const QVariantList &args )
@@ -2159,6 +2162,7 @@
     }
 }
 
+} // namespace Okular
 
 #include "part.moc"
 
--- branches/KDE/4.3/kdegraphics/okular/part.h #1040790:1040791
@@ -59,10 +59,9 @@
 
 namespace Okular
 {
-class ExportFormat;
-}
 
 class BrowserExtension;
+class ExportFormat;
 
 /**
  * This is a "Part".  It that does all the real work in a KPart
@@ -274,6 +273,8 @@
         void slotGeneratorPreferences();
 };
 
+}
+
 #endif
 
 /* kate: replace-tabs on; indent-width 4; */


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