From 152c21c949c4524f50fb7149646e1cdc0b0bd3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 8 Jul 2015 22:45:21 +0200 Subject: [PATCH] Fix FTBFS with clang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 70e8f7e81a968cc4accdebdb298c91376db97c44) --- .../plugin_batchprocessimages.h | 18 ++++++++++-------- kipi-plugins/mpegencoder/kimg2mpg.h | 2 +- kipi-plugins/printwizard/cropframe.cpp | 2 +- .../sendimages/listimageserrordialog.h | 2 +- kipi-plugins/sendimages/plugin_sendimages.h | 4 +++- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h index a78d85e..73d7bef 100644 --- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h +++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h @@ -33,14 +33,16 @@ class TDEAction; -class KIPIBatchProcessImagesPlugin::BorderImagesDialog; -class KIPIBatchProcessImagesPlugin::ColorImagesDialog; -class KIPIBatchProcessImagesPlugin::ConvertImagesDialog; -class KIPIBatchProcessImagesPlugin::EffectImagesDialog; -class KIPIBatchProcessImagesPlugin::FilterImagesDialog; -class KIPIBatchProcessImagesPlugin::RenameImagesDialog; -class KIPIBatchProcessImagesPlugin::RecompressImagesDialog; -class KIPIBatchProcessImagesPlugin::ResizeImagesDialog; +namespace KIPIBatchProcessImagesPlugin { + class BorderImagesDialog; + class ColorImagesDialog; + class ConvertImagesDialog; + class EffectImagesDialog; + class FilterImagesDialog; + class RenameImagesDialog; + class RecompressImagesDialog; + class ResizeImagesDialog; +} class Plugin_BatchProcessImages : public KIPI::Plugin { diff --git a/kipi-plugins/mpegencoder/kimg2mpg.h b/kipi-plugins/mpegencoder/kimg2mpg.h index 8028950..3294560 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.h +++ b/kipi-plugins/mpegencoder/kimg2mpg.h @@ -66,7 +66,7 @@ class KColorButton; class TDEListBox; class KButtonBox; class KProgress; -class KURL::List; +class KURL; namespace KIPIMPEGEncoderPlugin { diff --git a/kipi-plugins/printwizard/cropframe.cpp b/kipi-plugins/printwizard/cropframe.cpp index b92c392..13cb3c8 100644 --- a/kipi-plugins/printwizard/cropframe.cpp +++ b/kipi-plugins/printwizard/cropframe.cpp @@ -36,7 +36,7 @@ extern "C" namespace KIPIPrintWizardPlugin { -CropFrame::CropFrame(TQWidget *parent=0, const char *name=0) +CropFrame::CropFrame(TQWidget *parent, const char *name) : TQWidget(parent, name) { m_mouseDown = false; diff --git a/kipi-plugins/sendimages/listimageserrordialog.h b/kipi-plugins/sendimages/listimageserrordialog.h index 515ccce..be02d00 100644 --- a/kipi-plugins/sendimages/listimageserrordialog.h +++ b/kipi-plugins/sendimages/listimageserrordialog.h @@ -28,7 +28,7 @@ #include class TDEListView; -class KURL::List; +class KURL; namespace KIPISendimagesPlugin { diff --git a/kipi-plugins/sendimages/plugin_sendimages.h b/kipi-plugins/sendimages/plugin_sendimages.h index d56c138..d745a94 100644 --- a/kipi-plugins/sendimages/plugin_sendimages.h +++ b/kipi-plugins/sendimages/plugin_sendimages.h @@ -30,7 +30,9 @@ class TQCustomEvent; class TDEAction; -class KIPISendimagesPlugin::SendImages; +namespace KIPISendimagesPlugin { + class SendImages; +} namespace KIPI {