From 4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:56:40 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- kig/objects/bogus_imp.cc | 2 +- kig/objects/circle_imp.cc | 2 +- kig/objects/circle_type.cc | 2 +- kig/objects/common.h | 2 +- kig/objects/conic_imp.cc | 2 +- kig/objects/conic_types.cc | 2 +- kig/objects/cubic_imp.cc | 2 +- kig/objects/cubic_type.cc | 2 +- kig/objects/intersection_types.cc | 2 +- kig/objects/inversion_type.cc | 2 +- kig/objects/line_imp.cc | 2 +- kig/objects/line_type.cc | 2 +- kig/objects/locus_imp.cc | 2 +- kig/objects/object_imp.cc | 2 +- kig/objects/object_imp_factory.cc | 2 +- kig/objects/object_type.cc | 2 +- kig/objects/other_imp.cc | 2 +- kig/objects/point_imp.cc | 2 +- kig/objects/point_type.cc | 2 +- kig/objects/polygon_imp.cc | 2 +- kig/objects/polygon_type.cc | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) (limited to 'kig/objects') diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cc index b7b8f41e..76d724b1 100644 --- a/kig/objects/bogus_imp.cc +++ b/kig/objects/bogus_imp.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include "../misc/rect.h" diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc index 38522c22..16b3a5b7 100644 --- a/kig/objects/circle_imp.cc +++ b/kig/objects/circle_imp.cc @@ -27,7 +27,7 @@ #include "../kig/kig_document.h" #include "../kig/kig_view.h" -#include +#include #include diff --git a/kig/objects/circle_type.cc b/kig/objects/circle_type.cc index 97d2f615..c47677ab 100644 --- a/kig/objects/circle_type.cc +++ b/kig/objects/circle_type.cc @@ -24,7 +24,7 @@ #include "../misc/common.h" -#include +#include static const char constructcirclethroughpointstat[] = I18N_NOOP( "Construct a circle through this point" ); diff --git a/kig/objects/common.h b/kig/objects/common.h index f1ea5b8d..f9d4517a 100644 --- a/kig/objects/common.h +++ b/kig/objects/common.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include class Coordinate; class KigDocument; diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cc index 81331522..dcbd23fd 100644 --- a/kig/objects/conic_imp.cc +++ b/kig/objects/conic_imp.cc @@ -27,7 +27,7 @@ #include "../kig/kig_document.h" #include "../kig/kig_view.h" -#include +#include ObjectImp* ConicImp::transform( const Transformation& t ) const { diff --git a/kig/objects/conic_types.cc b/kig/objects/conic_types.cc index 34396369..be94cf56 100644 --- a/kig/objects/conic_types.cc +++ b/kig/objects/conic_types.cc @@ -28,7 +28,7 @@ #include "../kig/kig_commands.h" #include "../kig/kig_part.h" -#include +#include static const char conic_constructstatement[] = I18N_NOOP( "Construct a conic through this point" ); diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc index 9fc8c53c..7fb5ec63 100644 --- a/kig/objects/cubic_imp.cc +++ b/kig/objects/cubic_imp.cc @@ -26,7 +26,7 @@ #include "../kig/kig_view.h" #include -#include +#include CubicImp::CubicImp( const CubicCartesianData& data ) : CurveImp(), mdata( data ) diff --git a/kig/objects/cubic_type.cc b/kig/objects/cubic_type.cc index c322b8c3..24bfbda4 100644 --- a/kig/objects/cubic_type.cc +++ b/kig/objects/cubic_type.cc @@ -21,7 +21,7 @@ #include "point_imp.h" #include "bogus_imp.h" -#include +#include static const char cubictpstatement[] = I18N_NOOP( "Construct a cubic curve through this point" ); diff --git a/kig/objects/intersection_types.cc b/kig/objects/intersection_types.cc index 804d498d..0718bc23 100644 --- a/kig/objects/intersection_types.cc +++ b/kig/objects/intersection_types.cc @@ -25,7 +25,7 @@ #include "other_imp.h" #include "point_imp.h" -#include +#include static const char intersectlinestat[] = I18N_NOOP( "Intersect with this line" ); diff --git a/kig/objects/inversion_type.cc b/kig/objects/inversion_type.cc index 0ab77780..4f270582 100644 --- a/kig/objects/inversion_type.cc +++ b/kig/objects/inversion_type.cc @@ -24,7 +24,7 @@ #include "../misc/common.h" -#include +#include static const char str1[] = I18N_NOOP( "Invert with respect to this circle" ); static const char str2[] = I18N_NOOP( "Select the circle we want to invert against..." ); diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cc index a49078a1..4223000b 100644 --- a/kig/objects/line_imp.cc +++ b/kig/objects/line_imp.cc @@ -26,7 +26,7 @@ #include "../misc/kigpainter.h" #include "../kig/kig_view.h" -#include +#include #include using namespace std; diff --git a/kig/objects/line_type.cc b/kig/objects/line_type.cc index a02cc80b..bd9a5f3e 100644 --- a/kig/objects/line_type.cc +++ b/kig/objects/line_type.cc @@ -31,7 +31,7 @@ #include -#include +#include static const ArgsParser::spec argsspecSegmentAB[] = { diff --git a/kig/objects/locus_imp.cc b/kig/objects/locus_imp.cc index edbdc88b..fcbfe7a7 100644 --- a/kig/objects/locus_imp.cc +++ b/kig/objects/locus_imp.cc @@ -26,7 +26,7 @@ #include "../kig/kig_view.h" -#include +#include #include diff --git a/kig/objects/object_imp.cc b/kig/objects/object_imp.cc index 9a3ee679..1f7ad798 100644 --- a/kig/objects/object_imp.cc +++ b/kig/objects/object_imp.cc @@ -21,7 +21,7 @@ #include "../misc/coordinate.h" -#include +#include #include class ObjectImpType::StaticPrivate diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc index d095c238..dd184295 100644 --- a/kig/objects/object_imp_factory.cc +++ b/kig/objects/object_imp_factory.cc @@ -32,7 +32,7 @@ #include -#include +#include const ObjectImpFactory* ObjectImpFactory::instance() { diff --git a/kig/objects/object_type.cc b/kig/objects/object_type.cc index ea85e4f8..3b2fc108 100644 --- a/kig/objects/object_type.cc +++ b/kig/objects/object_type.cc @@ -24,7 +24,7 @@ #include -#include +#include const char* ObjectType::fullName() const { diff --git a/kig/objects/other_imp.cc b/kig/objects/other_imp.cc index 137a3e93..5c063753 100644 --- a/kig/objects/other_imp.cc +++ b/kig/objects/other_imp.cc @@ -28,7 +28,7 @@ #include "../misc/goniometry.h" #include "../kig/kig_view.h" -#include +#include #include #include diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cc index 539f98b3..4cc4168c 100644 --- a/kig/objects/point_imp.cc +++ b/kig/objects/point_imp.cc @@ -24,7 +24,7 @@ #include "../kig/kig_document.h" #include "../kig/kig_view.h" -#include +#include PointImp::PointImp( const Coordinate& c ) : mc( c ) diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc index 2acd8479..59f495b9 100644 --- a/kig/objects/point_type.cc +++ b/kig/objects/point_type.cc @@ -33,7 +33,7 @@ #include "../kig/kig_view.h" #include "../kig/kig_commands.h" -#include +#include static const ArgsParser::spec argsspecFixedPoint[] = { diff --git a/kig/objects/polygon_imp.cc b/kig/objects/polygon_imp.cc index 5c001df6..dd3ffa44 100644 --- a/kig/objects/polygon_imp.cc +++ b/kig/objects/polygon_imp.cc @@ -29,7 +29,7 @@ #include "../kig/kig_document.h" #include "../kig/kig_view.h" -#include +#include #include diff --git a/kig/objects/polygon_type.cc b/kig/objects/polygon_type.cc index bca867da..cd1fb544 100644 --- a/kig/objects/polygon_type.cc +++ b/kig/objects/polygon_type.cc @@ -25,7 +25,7 @@ #include "../misc/common.h" -#include +#include #include #include -- cgit v1.2.3