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

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       Urs Wolfer <uwolfer () kde ! org>
Date:       2008-07-22 21:28:21
Message-ID: 1216762101.639276.25054.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 836739 by uwolfer:

* .cc -> .cpp
* warnings--
* include cleanups
* better include guard

 M  +1 -1      CMakeLists.txt  
 D             khtml_settings.cc  
 AM            khtml_settings.cpp   khtml_settings.cc#836738 [License: LGPL (v2+)]
 M  +6 -6      khtml_settings.h  


--- trunk/KDE/kdelibs/khtml/CMakeLists.txt #836738:836739
@@ -288,7 +288,7 @@
    khtml_part.cpp
    khtml_run.cpp
    khtml_global.cpp
-   khtml_settings.cc
+   khtml_settings.cpp
    khtml_events.cpp
    khtml_ext.cpp
    khtml_pagecache.cpp
** trunk/KDE/kdelibs/khtml/khtml_settings.cpp #property svn:eol-style
   + native
** trunk/KDE/kdelibs/khtml/khtml_settings.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdelibs/khtml/khtml_settings.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdelibs/khtml/khtml_settings.cpp #property svn:mime-type
   + text/x-c++src
--- trunk/KDE/kdelibs/khtml/khtml_settings.h #836738:836739
@@ -17,20 +17,20 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __konq_htmlsettings_h__
-#define __konq_htmlsettings_h__
+#ifndef KHTML_SETTINGS_H
+#define KHTML_SETTINGS_H
 
 class KConfig;
 class KConfigGroup;
+
 #include <khtml_export.h>
+
 #include <QtGui/QColor>
-#include <QtCore/QString>
+#include <QtGui/QFont> // ### KDE 5: remove
+#include <QtCore/QMap> // ### KDE 5: remove
 #include <QtCore/QStringList>
-#include <QtGui/QFont>
-#include <QtCore/QMap>
 #include <QtCore/QPair>
 
-
 struct KPerDomainSettings;
 class KHTMLSettingsPrivate;
 
[prev in list] [next in list] [prev in thread] [next in thread]