[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/kdeprint
From: Alex Merry <huntedhacker () tiscali ! co ! uk>
Date: 2007-09-05 16:10:23
Message-ID: 1189008623.656223.32182.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 708768 by alexmerry:
Revert last (done the long way, since svn up -r PREV; svn commit
isn't working for me)
M +1 -1 driver.cpp
M +1 -1 driveritem.cpp
A driveritem.h driveritem_p.h#708763 [License: LGPL (v2)]
D driveritem_p.h
M +2 -2 driverview.cpp
M +2 -2 droptionview.cpp
A droptionview.h droptionview_p.h#708763 [License: LGPL (v2)]
D droptionview_p.h
M +1 -1 kfilelist.cpp
A kfilelist.h kfilelist_p.h#708763 [License: LGPL (v2)]
D kfilelist_p.h
M +1 -1 kmjobmanager.cpp
M +2 -2 kmmanager.cpp
M +1 -1 kmspecialmanager.cpp
A kmspecialmanager.h kmspecialmanager_p.h#708763 [License: LGPL (v2)]
D kmspecialmanager_p.h
M +1 -1 kmthreadjob.cpp
A kmthreadjob.h kmthreadjob_p.h#708763 [License: LGPL (v2)]
D kmthreadjob_p.h
M +4 -4 kmuimanager.cpp
M +2 -2 kpfileselectpage.cpp
A kpfileselectpage.h kpfileselectpage_p.h#708763 [License: LGPL (v2)]
D kpfileselectpage_p.h
M +1 -1 kpfilterpage.cpp
A kpfilterpage.h kpfilterpage_p.h#708763 [License: LGPL (v2)]
D kpfilterpage_p.h
M +1 -1 kpmarginpage.cpp
A kpmarginpage.h kpmarginpage_p.h#708763 [License: LGPL (v2)]
D kpmarginpage_p.h
M +2 -2 kpposterpage.cpp
A kpposterpage.h kpposterpage_p.h#708763 [License: LGPL (v2)]
D kpposterpage_p.h
M +1 -1 kprintdialog.cpp
M +1 -1 kprinter.cpp
M +2 -2 kprinterimpl.cpp
M +1 -1 kprintpreview.cpp
A kprintpreview.h kprintpreview_p.h#708763 [License: LGPL (v2)]
D kprintpreview_p.h
M +1 -1 marginpreview.cpp
A marginpreview.h marginpreview_p.h#708763 [License: LGPL (v2)]
D marginpreview_p.h
M +1 -1 marginvaluewidget.cpp
A marginvaluewidget.h marginvaluewidget_p.h#708763 [License: LGPL (v2)]
D marginvaluewidget_p.h
M +2 -2 marginwidget.cpp
M +1 -1 posterpreview.cpp
A posterpreview.h posterpreview_p.h#708763 [License: LGPL (v2)]
D posterpreview_p.h
M +1 -1 printerfilter.cpp
A printerfilter.h printerfilter_p.h#708763 [License: LGPL (v2)]
D printerfilter_p.h
M +1 -1 treecombobox.cpp
A treecombobox.h treecombobox_p.h#708763 [License: LGPL (v2)]
D treecombobox_p.h
M +12 -0 util.h
--- trunk/KDE/kdelibs/kdeprint/driver.cpp #708767:708768
@@ -18,7 +18,7 @@
**/
#include "driver.h"
-#include "driveritem_p.h"
+#include "driveritem.h"
#include <QtCore/QFile>
#include <QtCore/QStringList>
--- trunk/KDE/kdelibs/kdeprint/driveritem.cpp #708767:708768
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "driveritem_p.h"
+#include "driveritem.h"
#include "driver.h"
#include <QtGui/QPainter>
--- trunk/KDE/kdelibs/kdeprint/driverview.cpp #708767:708768
@@ -18,8 +18,8 @@
**/
#include "driverview.h"
-#include "droptionview_p.h"
-#include "driveritem_p.h"
+#include "droptionview.h"
+#include "driveritem.h"
#include "driver.h"
#include <QtGui/QHeaderView>
--- trunk/KDE/kdelibs/kdeprint/droptionview.cpp #708767:708768
@@ -17,9 +17,9 @@
* Boston, MA 02110-1301, USA.
**/
-#include "droptionview_p.h"
+#include "droptionview.h"
#include "driver.h"
-#include "driveritem_p.h"
+#include "driveritem.h"
#include <math.h>
#include <QtGui/QLineEdit>
--- trunk/KDE/kdelibs/kdeprint/kfilelist.cpp #708767:708768
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "kfilelist_p.h"
+#include "kfilelist.h"
#include <QtGui/QToolButton>
#include <QtGui/QLabel>
--- trunk/KDE/kdelibs/kdeprint/kmjobmanager.cpp #708767:708768
@@ -19,7 +19,7 @@
#include "kmjobmanager.h"
#include "kmjob.h"
-#include "kmthreadjob_p.h"
+#include "kmthreadjob.h"
#include "kmfactory.h"
#include <kdebug.h>
--- trunk/KDE/kdelibs/kdeprint/kmmanager.cpp #708767:708768
@@ -22,8 +22,8 @@
#include "kmdbentry.h"
#include "kmfactory.h"
#include "kmvirtualmanager.h"
-#include "kmspecialmanager_p.h"
-#include "printerfilter_p.h"
+#include "kmspecialmanager.h"
+#include "printerfilter.h"
#include "kprinter.h"
#include <QtGui/QActionGroup>
--- trunk/KDE/kdelibs/kdeprint/kmspecialmanager.cpp #708767:708768
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "kmspecialmanager_p.h"
+#include "kmspecialmanager.h"
#include "kmmanager.h"
#include "kmprinter.h"
#include "kdeprintcheck.h"
--- trunk/KDE/kdelibs/kdeprint/kmthreadjob.cpp #708767:708768
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "kmthreadjob_p.h"
+#include "kmthreadjob.h"
#include "kmjob.h"
#include "kmjobmanager.h"
--- trunk/KDE/kdelibs/kdeprint/kmuimanager.cpp #708767:708768
@@ -27,12 +27,12 @@
#include "kmmanager.h"
#include "kmprinter.h"
#include "kpdriverpage.h"
-#include "kpmarginpage_p.h"
+#include "kpmarginpage.h"
#include "kpqtpage.h"
-#include "kpfilterpage_p.h"
-#include "kpfileselectpage_p.h"
+#include "kpfilterpage.h"
+#include "kpfileselectpage.h"
#include "kxmlcommand.h"
-#include "kpposterpage_p.h"
+#include "kpposterpage.h"
#include <config.h>
--- trunk/KDE/kdelibs/kdeprint/kpfileselectpage.cpp #708767:708768
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
**/
-#include "kpfileselectpage_p.h"
-#include "kfilelist_p.h"
+#include "kpfileselectpage.h"
+#include "kfilelist.h"
#include <QtGui/QLayout>
#include <QtCore/QStringList>
--- trunk/KDE/kdelibs/kdeprint/kpfilterpage.cpp #708767:708768
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "kpfilterpage_p.h"
+#include "kpfilterpage.h"
#include "kmfactory.h"
#include "kxmlcommand.h"
--- trunk/KDE/kdelibs/kdeprint/kpmarginpage.cpp #708767:708768
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "kpmarginpage_p.h"
+#include "kpmarginpage.h"
#include "kprinter.h"
#include "driver.h"
#include "marginwidget.h"
--- trunk/KDE/kdelibs/kdeprint/kpposterpage.cpp #708767:708768
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
**/
-#include "kpposterpage_p.h"
-#include "posterpreview_p.h"
+#include "kpposterpage.h"
+#include "posterpreview.h"
#include "kprinter.h"
#include "kmfactory.h"
#include "util.h"
--- trunk/KDE/kdelibs/kdeprint/kprintdialog.cpp #708767:708768
@@ -34,7 +34,7 @@
#include "kprinterpropertydialog.h"
#include "plugincombobox.h"
#include "kpcopiespage.h"
-#include "treecombobox_p.h"
+#include "treecombobox.h"
#include "messagewindow.h"
#include <QtGui/QGroupBox>
--- trunk/KDE/kdelibs/kdeprint/kprinter.cpp #708767:708768
@@ -21,7 +21,7 @@
#include "kprinter.h"
#include "kprinterimpl.h"
#include "kprintdialog.h"
-#include "kprintpreview_p.h"
+#include "kprintpreview.h"
#include "kmfactory.h"
#include "kmuimanager.h"
#include "kmmanager.h"
--- trunk/KDE/kdelibs/kdeprint/kprinterimpl.cpp #708767:708768
@@ -24,8 +24,8 @@
#include "kmmanager.h"
#include "kmuimanager.h"
#include "kxmlcommand.h"
-#include "kmspecialmanager_p.h"
-#include "kmthreadjob_p.h"
+#include "kmspecialmanager.h"
+#include "kmthreadjob.h"
#include "kmprinter.h"
#include "driver.h"
--- trunk/KDE/kdelibs/kdeprint/kprintpreview.cpp #708767:708768
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "kprintpreview_p.h"
+#include "kprintpreview.h"
#include "kmfactory.h"
#include <QtCore/QFile>
--- trunk/KDE/kdelibs/kdeprint/marginpreview.cpp #708767:708768
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "marginpreview_p.h"
+#include "marginpreview.h"
#include <klocale.h>
#include <kdebug.h>
--- trunk/KDE/kdelibs/kdeprint/marginvaluewidget.cpp #708767:708768
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "marginvaluewidget_p.h"
+#include "marginvaluewidget.h"
#include <math.h>
#include <kglobal.h>
--- trunk/KDE/kdelibs/kdeprint/marginwidget.cpp #708767:708768
@@ -18,8 +18,8 @@
**/
#include "marginwidget.h"
-#include "marginpreview_p.h"
-#include "marginvaluewidget_p.h"
+#include "marginpreview.h"
+#include "marginvaluewidget.h"
#include "kprinter.h"
#include <QtGui/QComboBox>
--- trunk/KDE/kdelibs/kdeprint/posterpreview.cpp #708767:708768
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "posterpreview_p.h"
+#include "posterpreview.h"
#include <kdebug.h>
#include <kprocess.h>
--- trunk/KDE/kdelibs/kdeprint/printerfilter.cpp #708767:708768
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "printerfilter_p.h"
+#include "printerfilter.h"
#include "kmprinter.h"
#include "kmfactory.h"
--- trunk/KDE/kdelibs/kdeprint/treecombobox.cpp #708767:708768
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
**/
-#include "treecombobox_p.h"
+#include "treecombobox.h"
#include <QtGui/QHeaderView>
#include <QtGui/QStandardItem>
--- trunk/KDE/kdelibs/kdeprint/util.h #708767:708768
@@ -25,8 +25,14 @@
#include <kurl.h>
#include <klocale.h>
+#ifdef __GNUC__
+#warning remove function from global namespace
+#endif
KUrl smbToUrl(const QString& work, const QString& server, const QString& printer);
+#ifdef __GNUC__
+#warning remove function from global namespace
+#endif
void urlToSmb(const KUrl& url, QString& work, QString& server, QString& printer);
// those 2 are only workarounds when the login/password may contain
@@ -34,8 +40,14 @@
// as other SMB tools (smbspool) doesn't seem to support encoding. This
// utilities allow to continue working KUrl class (and encoding) within
// KDEPrint, but without encoding outside KDEPrint (shoudl fix bug #38733)
+#ifdef __GNUC__
+#warning remove function from global namespace
+#endif
KUrl smbToUrl(const QString& s);
+#ifdef __GNUC__
+#warning remove function from global namespace
+#endif
QString urlToSmb(const KUrl& url);
#ifdef __GNUC__
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic