Port some I18N_NOOP

misc/builtin_stuff.cc

@@ -129,8 +129,8 @@ void setupBuiltinStuff()
       AngleImp::stype(),
       I18N_NOOP( "Construct Bisector of This Angle" ),
       I18N_NOOP( "Select the angle you want to construct the bisector of..." ),
-      I18N_NOOP( "Angle Bisector" ),
-      I18N_NOOP( "The bisector of an angle" ),
+      i18n( "Angle Bisector" ),
+      i18n( "The bisector of an angle" ),
       "angle_bisector",
       "angle-bisector" );
     actions->add( new ConstructibleAction( &anglebisectionctor, "objects_new_angle_bisector" ) );
@@ -641,7 +641,7 @@ void setupBuiltinStuff()
     c = new TestConstructor(
       ConvexPolygonTestType::instance(),
       i18n( "Convex Polygon Test" ),
-      I18N_NOOP( "Test whether a given polygon is convex" ),
+      i18n( "Test whether a given polygon is convex" ),
       "test" );
     ctors->add( c );
     actions->add( new ConstructibleAction( c, "objects_new_convexpolygontest" ) );

misc/object_constructor.cc

@@ -515,8 +515,8 @@ bool ObjectConstructor::isIntersection() const
 
 PropertyObjectConstructor::PropertyObjectConstructor(
     const ObjectImpType* imprequirement, const char* usetext,
-    const char* selectstat, const char* descname, const char* desc,
-    const char* iconfile, const char* propertyinternalname )
+    const char* selectstat, const QString &descname, const QString &desc,
+    const QString &iconfile, const char* propertyinternalname )
   : StandardConstructorBase( descname, desc, iconfile, mparser ),
     mpropinternalname( propertyinternalname )
 {

misc/object_constructor.h

@@ -121,7 +121,7 @@ class StandardConstructorBase
   : public ObjectConstructor
 {
       QString mdescname;
-      QString mdesc; // TODO Use KLazyLocalizedString
+      QString mdesc;
   QString miconfile;
   const ArgsParser& margsparser;
 public:
@@ -205,10 +205,9 @@ class PropertyObjectConstructor
   ArgsParser mparser;
   const char* mpropinternalname;
 public:
-  explicit PropertyObjectConstructor(
-    const ObjectImpType* imprequirement, const char* usetext,
-    const char* selectstat, const char* descname, const char* desc,
-    const char* iconfile, const char* propertyinternalname );
+  explicit PropertyObjectConstructor(const ObjectImpType* imprequirement, const char* usetext,
+    const char* selectstat, const QString &descname, const QString &desc,
+    const QString &iconfile, const char* propertyinternalname );
 
   ~PropertyObjectConstructor();
 

misc/special_constructors.cc

@@ -371,7 +371,7 @@ static const struct ArgsParser::spec argsspecpp[] =
 };
 
 LocusConstructor::LocusConstructor()
-  : StandardConstructorBase( I18N_NOOP( "Locus" ), I18N_NOOP( "A locus" ),
+  : StandardConstructorBase( i18n( "Locus" ), i18n( "A locus" ),
                              "locus", margsparser ),
     margsparser( argsspecpp, 2 )
 {
@@ -579,8 +579,8 @@ bool PointSequenceConstructor::isTransform() const
 
 PolygonBNPTypeConstructor::PolygonBNPTypeConstructor()
   : PointSequenceConstructor(
-    I18N_NOOP( "Polygon by Its Vertices" ),
-    I18N_NOOP( "Construct a polygon by giving its vertices" ),
+    i18n( "Polygon by Its Vertices" ),
+    i18n( "Construct a polygon by giving its vertices" ),
     "kig_polygon",
     PolygonBNPType::instance() )
 {
@@ -658,8 +658,8 @@ void PolygonBNPTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPaint
 
 OpenPolygonTypeConstructor::OpenPolygonTypeConstructor()
   : PointSequenceConstructor(
-    I18N_NOOP( "Open Polygon (Polygonal Line)" ),
-    I18N_NOOP( "Construct an open polygon" ),
+    i18n( "Open Polygon (Polygonal Line)" ),
+    i18n( "Construct an open polygon" ),
     "openpolygon",
     OpenPolygonType::instance() )
 {
@@ -1575,8 +1575,8 @@ bool GenericAffinityConstructor::isAlreadySelectedOK(const std::vector< ObjectCa
 
 GenericProjectivityConstructor::GenericProjectivityConstructor()
   : MergeObjectConstructor(
-    I18N_NOOP( "Generic Projective Transformation" ),
-    I18N_NOOP( "The unique projective transformation that maps four points (or a quadrilateral) onto four other points (or a quadrilateral)" ),
+    i18n( "Generic Projective Transformation" ),
+    i18n( "The unique projective transformation that maps four points (or a quadrilateral) onto four other points (or a quadrilateral)" ),
     "genericprojectivity" )
 {
   SimpleObjectTypeConstructor* b2qu =
@@ -1608,8 +1608,8 @@ bool GenericProjectivityConstructor::isAlreadySelectedOK(const std::vector< Obje
 
 InversionConstructor::InversionConstructor()
   : MergeObjectConstructor(
-    I18N_NOOP( "Inversion of Point, Line or Circle" ),
-    I18N_NOOP( "The inversion of a point, line or circle with respect to a circle" ),
+    i18n( "Inversion of Point, Line or Circle" ),
+    i18n( "The inversion of a point, line or circle with respect to a circle" ),
     "inversion" )
 {
   SimpleObjectTypeConstructor* pointobj =