Fix incorrectly renamed strings

5 files changed, 49 insertions, 49 deletions

diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index 338cb08c..3e22fcdd 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -147,13 +147,13 @@ PropertyCommand::name() const
 void
 PropertyCommand::debug()
 {
-	kdDebug() << "PropertyCommand: name=\"" << name() << "\" widgets=" << m_oldvalues.keys() 
+	kdDebug() << "PropertyCommand: name=\"" << name() << "\" widgets=" << m_oldvalues.keys()
 		<< " value=" << m_value << " oldValues=" << m_oldvalues.values() << endl;
 }
 
 // GeometryPropertyCommand (for multiples widgets)
 
-GeometryPropertyCommand::GeometryPropertyCommand(WidgetPropertySet *set, 
+GeometryPropertyCommand::GeometryPropertyCommand(WidgetPropertySet *set,
 	const TQStringList &names, const TQPoint& oldPos)
  : Command(), m_propSet(set), m_names(names), m_oldPos(oldPos)
 {
@@ -215,7 +215,7 @@ GeometryPropertyCommand::name() const
 void
 GeometryPropertyCommand::debug()
 {
-	kdDebug() << "GeometryPropertyCommand: pos=" << m_pos << " oldPos=" << m_oldPos 
+	kdDebug() << "GeometryPropertyCommand: pos=" << m_pos << " oldPos=" << m_oldPos
 		<< " widgets=" << m_names << endl;
 }
 
@@ -367,7 +367,7 @@ AlignWidgetsCommand::name() const
 void
 AlignWidgetsCommand::debug()
 {
-	kdDebug() << "AlignWidgetsCommand: name=\"" << name() << "\" form=" << m_form->widget()->name() 
+	kdDebug() << "AlignWidgetsCommand: name=\"" << name() << "\" form=" << m_form->widget()->name()
 		<< " widgets=" << m_pos.keys() << endl;
 }
 
@@ -606,13 +606,13 @@ AdjustSizeCommand::name() const
 void
 AdjustSizeCommand::debug()
 {
-	kdDebug() << "AdjustSizeCommand: name=\"" << name() << "\" form=" << m_form->widget()->name() 
+	kdDebug() << "AdjustSizeCommand: name=\"" << name() << "\" form=" << m_form->widget()->name()
 		<< " widgets=" << m_sizes.keys() << endl;
 }
 
 // LayoutPropertyCommand
 
-LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCString &wname, 
+LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCString &wname,
 	const TQVariant &oldValue, const TQVariant &value)
  : PropertyCommand(buf, wname, oldValue, value, "layout")
 {
@@ -744,7 +744,7 @@ InsertWidgetCommand::execute()
 		kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl;
 		return;
 	}
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) 
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
 //! @todo allow setting this for data view mode as well
 	if (m_form->designMode()) {
 		//don't generate accelerators for widgets in design mode
@@ -805,7 +805,7 @@ InsertWidgetCommand::execute()
 	m_container->reloadLayout(); // reload the layout to take the new wigdet into account
 
 	m_container->setSelectedWidget(w, false);
-	if (m_container->form()->library()->internalProperty(w->className(), 
+	if (m_container->form()->library()->internalProperty(w->className(),
 			"dontStartEditingOnInserting").isEmpty())
 	{
 		m_container->form()->library()->startEditing(
@@ -838,9 +838,9 @@ InsertWidgetCommand::name() const
 void
 InsertWidgetCommand::debug()
 {
-	kdDebug() << "InsertWidgetCommand: name=\"" << name() << "\" generatedName=" << m_name 
+	kdDebug() << "InsertWidgetCommand: name=\"" << name() << "\" generatedName=" << m_name
 		<< " container=" << m_containername
-		<< " form=" << m_form->widget()->name() << " class=" << m_class 
+		<< " form=" << m_form->widget()->name() << " class=" << m_class
 		<< " rect=" << m_insertRect << " pos=" << m_point << endl;
 }
 
@@ -897,7 +897,7 @@ CreateLayoutCommand::execute()
 		m_name = m_form->objectTree()->generateUniqueName(classname);
 
 	TQWidget *w = lib->createWidget(classname, container->widget(), m_name.latin1(), container);
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) 
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
 //! @todo allow setting this for data view mode as well
 	if (w) {
 		if (m_form->designMode()) {
@@ -983,19 +983,19 @@ CreateLayoutCommand::name() const
 	switch(m_type)
 	{
 		case Container::HBox:
-			return i18n("Group WidgetsQt::Horizontally");
+			return i18n("Group Widgets Horizontally");
 		case Container::VBox:
-			return i18n("Group WidgetsQt::Vertically");
+			return i18n("Group Widgets Vertically");
 		case Container::Grid:
 			return i18n("Group Widgets in a Grid");
 		case Container::HSplitter:
-			return i18n("Group WidgetsQt::Horizontally in a Splitter");
+			return i18n("Group Widgets Horizontally in a Splitter");
 		case Container::VSplitter:
-			return i18n("Group WidgetsQt::Vertically in a Splitter");
+			return i18n("Group Widgets Vertically in a Splitter");
 		case Container::HFlow:
 			return i18n("Group Widgets By Rows");
 		case Container::VFlow:
-			return i18n("Group WidgetsQt::Vertically By Columns");
+			return i18n("Group Widgets Vertically By Columns");
 		default:
 			return i18n("Group widgets");
 	}
@@ -1004,7 +1004,7 @@ CreateLayoutCommand::name() const
 void
 CreateLayoutCommand::debug()
 {
-	kdDebug() << "CreateLayoutCommand: name=\"" << name() << "\" generatedName=" << m_name 
+	kdDebug() << "CreateLayoutCommand: name=\"" << name() << "\" generatedName=" << m_name
 		<< " widgets=" << m_pos.keys() << " container=" << m_containername
 		<< " form=" << m_form->widget()->name() << endl;
 }
@@ -1366,7 +1366,7 @@ PasteWidgetCommand::debug()
 {
 	kdDebug() << "PasteWidgetCommand: pos=" << m_point
 		<< " widgets=" << m_names << " container=" << m_containername
-		<< " form=" << m_form->widget()->name() 
+		<< " form=" << m_form->widget()->name()
 		<< " data=\"" << m_data.left(80) << "...\"" << endl;
 }
 
@@ -1588,7 +1588,7 @@ CommandGroup::debug()
 	kdDebug() << "*CommandGroup: name=\"" << name() << "\" #=" << m_subCommands->commands().count() << endl;
 	uint i = 1;
 	for (TQPtrListIterator<KCommand> it(m_subCommands->commands()); it.current(); ++it, i++) {
-		kdDebug() << "#" << i << ":" 
+		kdDebug() << "#" << i << ":"
 			<< (m_commandsShouldntBeExecuted[it.current()] ? "!" : "") << "allowExecute:" << endl;
 		if (dynamic_cast<Command*>(it.current()))
 			dynamic_cast<Command*>(it.current())->debug();
diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h
index 7be11444..ecb2e837 100644
--- a/kexi/formeditor/widgetfactory.h
+++ b/kexi/formeditor/widgetfactory.h
@@ -150,13 +150,13 @@ class KFORMEDITOR_EXPORT WidgetInfo
 
 		WidgetInfo* inheritedClass() const { return m_inheritedClass; }
 
-		/*! Sets custom type \a type for property \a propertyName. 
-		 This allows to override default type, especially when custom property 
+		/*! Sets custom type \a type for property \a propertyName.
+		 This allows to override default type, especially when custom property
 		 and custom property editor item has to be used. */
 		void setCustomTypeForProperty(const char *propertyName, int type);
 
 		/*! \return custom type for property \a propertyName. If no specific custom type has been assigned,
-		 KoProperty::Auto is returned. 
+		 KoProperty::Auto is returned.
 		 @see setCustomTypeForProperty() */
 		int customTypeForProperty(const char *propertyName) const;
 
@@ -195,7 +195,7 @@ class KFORMEDITOR_EXPORT WidgetInfo
   You can use createMenuActions() to add custom items in widget's context menu. The previewWidget()
   is called when the Form gets in Preview mode, and you have a last opportunity to remove all editing-related
   stuff (see eg \ref Spring class).\n
-  You can also choose which properties to show in the Property Editor. 
+  You can also choose which properties to show in the Property Editor.
   By default, most all properties are shown (see implementation for details),
   but you can hide some reimplementing isPropertyVisibleInternal() (don't forget to call superclass' method)
   To add new properties, just define new TQ_PROPERTY in widget class definition.\n \n
@@ -236,15 +236,15 @@ class KFORMEDITOR_EXPORT WidgetInfo
   * "orientationSelectionPopup:verticalIcon" - the same for "Vertical" item.
     Set this property only for classes supporting orientations.
   * "orientationSelectionPopup:horizontalText" - sets a i18n'd text for "Horizontal" item
-    for objects of class 'ClassName', e.g. i18n("InsertQt::Horizontal Line").
+    for objects of class 'ClassName', e.g. i18n("Insert Horizontal Line").
     Set this property only for classes supporting orientations.
   * "orientationSelectionPopup:verticalText" - the same for "Vertical" item,
-    e.g. i18n("InsertQt::Vertical Line"). Set this property only for classes supporting orientations.
+    e.g. i18n("Insert Vertical Line"). Set this property only for classes supporting orientations.
   * "dontStartEditingOnInserting" - if not empty, WidgetFactory::startEditing() will not be executed upon
     widget inseting by a user.
-  * "forceShowAdvancedProperty:{propertyname}" - set it to "1" for "{propertyname}" advanced property 
-    if you want to force it to be visible even if WidgetLibrary::setAdvancedPropertiesVisible(false) 
-    has been called. For example, setting "forceShowAdvancedProperty:pixmap" to "1" 
+  * "forceShowAdvancedProperty:{propertyname}" - set it to "1" for "{propertyname}" advanced property
+    if you want to force it to be visible even if WidgetLibrary::setAdvancedPropertiesVisible(false)
+    has been called. For example, setting "forceShowAdvancedProperty:pixmap" to "1"
     unhides "pixmap" property for a given class.
 
   See StdWidgetFactory::StdWidgetFactory() for properties like
@@ -257,10 +257,10 @@ class KFORMEDITOR_EXPORT WidgetInfo
 class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 {
 	Q_OBJECT
-  
+
 	public:
 		//! Options used in createWidget()
-		enum CreateWidgetOptions { 
+		enum CreateWidgetOptions {
 			AnyOrientation = 1, //!< any orientation hint
 			HorizontalOrientation = 2,  //!< horizontal orientation hint
 			VerticalOrientation = 4, //!< vertical orientation hint
@@ -295,10 +295,10 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		 * \param options options for the created widget: orientation and view mode (see CreateWidgetOptions)
 		 */
 		virtual TQWidget* createWidget(const TQCString &classname, TQWidget *parent, const char *name,
-			KFormDesigner::Container *container, 
+			KFormDesigner::Container *container,
 			int options = DefaultOptions) = 0;
 
-		/*! Creates custom actions. Reimplement this if you need to add some 
+		/*! Creates custom actions. Reimplement this if you need to add some
 		 actions coming from the factory. */
 		virtual void createCustomActions(TDEActionCollection *col) { Q_UNUSED(col); };
 
@@ -372,14 +372,14 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 
 	protected:
 		/*! This function is called when we want to know whether the property should be visible.
-		 Implement it in the factory; don't forget to call implementation in the superclass. 
+		 Implement it in the factory; don't forget to call implementation in the superclass.
 		 Default implementation hides "caption", "icon", "sizeIncrement" and "iconText" properties. */
 		virtual bool isPropertyVisibleInternal(const TQCString &classname, TQWidget *w,
 			const TQCString &property, bool isTopLevel);
 
 		/*! Sometimes property sets should be reloaded when a given property value changed.
 		 Implement it in the factory. Default implementation always returns false. */
-		virtual bool propertySetShouldBeReloadedAfterPropertyChange(const TQCString& classname, TQWidget *w, 
+		virtual bool propertySetShouldBeReloadedAfterPropertyChange(const TQCString& classname, TQWidget *w,
 			const TQCString& property);
 
 		/*! This function creates a KLineEdit to input some text and edit a widget's contents.
@@ -497,8 +497,8 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		 It's value is inherited from WidgetLibrary. */
 		bool m_showAdvancedProperties;
 
-		/*! Contains name of an XMLGUI file providing toolbar buttons 
-		 (and menu items in the future?) for the factory. 
+		/*! Contains name of an XMLGUI file providing toolbar buttons
+		 (and menu items in the future?) for the factory.
 		 Can be empty, e.g. for the main factory which has XMLGUI defined in the shell window itself
 		 (e.g. kexiformpartinstui.rc for Kexi Forms). This name is set in WidgetLibrary::loadFactories() */
 		TQString m_xmlGUIFileName;
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index 23991774..f5da30e1 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -217,7 +217,7 @@ WidgetLibrary::lookupFactories()
 		}
 		const uint factoryVersion = ptr->property("X-KFormDesigner-WidgetFactoryVersion").toUInt();
 		if (KFormDesigner::version()!=factoryVersion) {
-			kdWarning() << TQString("WidgetLibrary::lookupFactories(): factory '%1'" 
+			kdWarning() << TQString("WidgetLibrary::lookupFactories(): factory '%1'"
 				" has version '%2' but required Widget Factory version is '%3'\n"
 				" -- skipping this factory!").arg(ptr->library()).arg(factoryVersion)
 				.arg(KFormDesigner::version()) << endl;
@@ -319,7 +319,7 @@ WidgetLibrary::createXML()
 }*/
 
 ActionList
-WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent, 
+WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent,
 	TQObject *receiver, const char *slot)
 {
 	loadFactories();
@@ -338,8 +338,8 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *p
 	ActionList actions;
 	for (TQAsciiDictIterator<WidgetInfo> it(d->widgets); it.current(); ++it)
 	{
-		LibActionWidget *a = new LibActionWidget(it.current(), 
-			it.current()->factory()->m_guiClient 
+		LibActionWidget *a = new LibActionWidget(it.current(),
+			it.current()->factory()->m_guiClient
 			? it.current()->factory()->m_guiClient->actionCollection() : parent);
 		connect(a, TQT_SIGNAL(prepareInsert(const TQCString &)), receiver, slot);
 		actions.append(a);
@@ -353,7 +353,7 @@ WidgetLibrary::addCustomWidgetActions(TDEActionCollection *col)
 	for (TQAsciiDictIterator<WidgetFactory> it(d->factories); it.current(); ++it)
 	{
 		it.current()->createCustomActions(
-			it.current()->m_guiClient 
+			it.current()->m_guiClient
 			? it.current()->m_guiClient->actionCollection() : col);
 	}
 }
@@ -730,13 +730,13 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup(
 	if (textHorizontal.isEmpty() && wclass->inheritedClass())
 		iconName = wclass->inheritedClass()->factory()->internalProperty(classname, "orientationSelectionPopup:horizontalText");
 	if (textHorizontal.isEmpty()) //default
-		textHorizontal = i18n("InsertQt::Horizontal Widget", "InsertQt::Horizontal");
+		textHorizontal = i18n("Insert Horizontal Widget", "Insert Horizontal");
 
 	TQString textVertical = wclass->factory()->internalProperty(classname, "orientationSelectionPopup:verticalText");
 	if (textVertical.isEmpty() && wclass->inheritedClass())
 		iconName = wclass->inheritedClass()->factory()->internalProperty(classname, "orientationSelectionPopup:verticalText");
 	if (textVertical.isEmpty()) //default
-		textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical");
+		textVertical = i18n("Insert Vertical Widget", "Insert Vertical");
 
 	TDEPopupMenu* popup = new TDEPopupMenu(parent, "orientationSelectionPopup");
 	popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").arg(wclass->name()));
diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h
index 76194d13..630b0307 100644
--- a/kexi/main/ksplitter.h
+++ b/kexi/main/ksplitter.h
@@ -47,13 +47,13 @@ class KDockWidget;
 class KDockSplitter : public TQWidget
 {
   //Q_OBJECT
-  
+
 public:
   /**
    * Constructor.
    * @param parent parent widget
    * @param name name
-   * @param orient orientation. Either @pQt::Vertical or @pQt::Horizontal
+   * @param orient orientation. Either @p Qt::Vertical or @p Qt::Horizontal
    * @param pos procentual position of the splitter. Must be int [0...100].
    */
   KDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50);
@@ -77,7 +77,7 @@ public:
    * Return the separator position in percent (%), so the range is [0..100]
    * @return separator position in percent
    */
-  int separatorPosInPercent() 
+  int separatorPosInPercent()
 #if KDE_IS_VERSION(3,4,89)
 	;
 #else
@@ -169,7 +169,7 @@ public:
   void restoreFromForcedFixedSize(KDockWidget *dw);
 
   /**
-   * The orientation is either @pQt::Horizontal or @pQt::Vertical.
+   * The orientation is either @p Qt::Horizontal or @p Qt::Vertical.
    */
   Qt::Orientation orientation(){return m_orientation;}
 
@@ -235,7 +235,7 @@ private:
   TQFrame* divider;
   /**
    * @p xpos and @p savedXPos represent the current divider position.
-   * If the orientation isQt::Horizontal @p xpos actually is "ypos". So
+   * If the orientation is Qt::Horizontal @p xpos actually is "ypos". So
    * do not get confused only because of the 'x'.
    *
    * xpos and savedXPos are internally high resolution. So *not* 0..100%
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index c23398e0..7353f16f 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -37,7 +37,7 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 		 ie as it is stored in m_list. You must delete the list after using it. */
 		TQPtrList<TQWidget>* widgetList() const;
 
-		/*! Sets layout's orientation to \a orientation. Default orientation isQt::Vertical. */
+		/*! Sets layout's orientation to \a orientation. Default orientation is Qt::Vertical. */
 		void  setOrientation(Qt::Orientation orientation) { m_orientation = orientation; }
 
 		/*! \return layout's orientation. */