Fix incorrect conversion

1 files changed, 91 insertions, 91 deletions

diff --git a/qtruby/rubylib/designer/rbuic/uic.h b/qtruby/rubylib/designer/rbuic/uic.h
index 18177ee7..ddfcc1be 100644
--- a/qtruby/rubylib/designer/rbuic/uic.h
+++ b/qtruby/rubylib/designer/rbuic/uic.h
@@ -37,12 +37,12 @@ public:
 	void setTabStop(uint n) {tabStop = n; calc();}
 	void operator++() {++current; calc();}
 	void operator--() {--current; calc();}
-	operator TTQString() {return indstr;}
+	operator TQString() {return indstr;}
 
 private:
 	uint tabStop;
 	uint current;
-	TTQString indstr;
+	TQString indstr;
 
 	void calc();
 };
@@ -51,95 +51,95 @@ private:
 class Uic : public Qt
 {
 public:
-    Uic( const TTQString &fn, TTQTextStream& out, TTQDomDocument doc, bool subcl,
-	 const TTQString &trm, const TTQString& subclname, bool omitForwardDecls,
-	 TTQString &uicClass, bool useKDE );
+    Uic( const TQString &fn, TQTextStream& out, TQDomDocument doc, bool subcl,
+	 const TQString &trm, const TQString& subclname, bool omitForwardDecls,
+	 TQString &uicClass, bool useKDE );
 
     static void setIndent(const RubyIndent &rubyind) {indent = rubyind;}
 
-    void createFormImpl( const TTQDomElement &e );
-
-    void createSubImpl( const TTQDomElement &e, const TTQString& subclname );
-
-    void createObjectDecl( const TTQDomElement& e );
-    void createAttrDecl( const TTQDomElement& e );
-    void createActionDecl( const TTQDomElement& e );
-    void createActionImpl( const TTQDomElement& e, const TTQString &parent );
-    void createToolbarImpl( const TTQDomElement &e, const TTQString &parentClass, const TTQString &parent );
-    void createMenuBarImpl( const TTQDomElement &e, const TTQString &parentClass, const TTQString &parent );
-    void createPopupMenuImpl( const TTQDomElement &e, const TTQString &parentClass, const TTQString &parent );
-    TTQString createObjectImpl( const TTQDomElement &e, const TTQString& parentClass, const TTQString& parent, const TTQString& layout = TTQString::null );
-    TTQString createLayoutImpl( const TTQDomElement &e, const TTQString& parentClass, const TTQString& parent, const TTQString& layout = TTQString::null );
-    TTQString createObjectInstance( const TTQString& objClass, const TTQString& parent, const TTQString& objName );
-    TTQString createSpacerImpl( const TTQDomElement &e, const TTQString& parentClass, const TTQString& parent, const TTQString& layout = TTQString::null );
-    void createExclusiveProperty( const TTQDomElement & e, const TTQString& exclusiveProp );
-    TTQString createListBoxItemImpl( const TTQDomElement &e, const TTQString &parent, TTQString *value = 0 );
-    TTQString createIconViewItemImpl( const TTQDomElement &e, const TTQString &parent );
-    TTQString createListViewColumnImpl( const TTQDomElement &e, const TTQString &parent, TTQString *value = 0 );
-    TTQString createTableRowColumnImpl( const TTQDomElement &e, const TTQString &parent, TTQString *value = 0 );
-    TTQString createListViewItemImpl( const TTQDomElement &e, const TTQString &parent,
-				    const TTQString &parentItem );
-    void createColorGroupImpl( const TTQString& cg, const TTQDomElement& e );
-    TTQColorGroup loadColorGroup( const TTQDomElement &e );
-
-    TTQDomElement getObjectProperty( const TTQDomElement& e, const TTQString& name );
-    TTQString getPixmapLoaderFunction( const TTQDomElement& e );
-    TTQString getFormClassName( const TTQDomElement& e );
-    TTQString getClassName( const TTQDomElement& e );
-    TTQString getObjectName( const TTQDomElement& e );
-    TTQString getLayoutName( const TTQDomElement& e );
-    TTQString getInclude( const TTQString& className );
-
-    TTQString setObjectProperty( const TTQString& objClass, const TTQString& obj, const TTQString &prop, const TTQDomElement &e, bool stdset );
-
-    TTQString registerObject( const TTQString& name );
-    TTQString registeredName( const TTQString& name );
-    bool isObjectRegistered( const TTQString& name );
-    TTQStringList unique( const TTQStringList& );
-
-    TTQString trcall( const TTQString& sourceText, const TTQString& comment = "" );
-
-    static void embed( TTQTextStream& out, const char* project, const TTQStringList& images );
-
-    friend void getDBConnections(Uic& uic, TTQString& s);
+    void createFormImpl( const TQDomElement &e );
+
+    void createSubImpl( const TQDomElement &e, const TQString& subclname );
+
+    void createObjectDecl( const TQDomElement& e );
+    void createAttrDecl( const TQDomElement& e );
+    void createActionDecl( const TQDomElement& e );
+    void createActionImpl( const TQDomElement& e, const TQString &parent );
+    void createToolbarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent );
+    void createMenuBarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent );
+    void createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent );
+    TQString createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null );
+    TQString createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null );
+    TQString createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName );
+    TQString createSpacerImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null );
+    void createExclusiveProperty( const TQDomElement & e, const TQString& exclusiveProp );
+    TQString createListBoxItemImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 );
+    TQString createIconViewItemImpl( const TQDomElement &e, const TQString &parent );
+    TQString createListViewColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 );
+    TQString createTableRowColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 );
+    TQString createListViewItemImpl( const TQDomElement &e, const TQString &parent,
+				    const TQString &parentItem );
+    void createColorGroupImpl( const TQString& cg, const TQDomElement& e );
+    TQColorGroup loadColorGroup( const TQDomElement &e );
+
+    TQDomElement getObjectProperty( const TQDomElement& e, const TQString& name );
+    TQString getPixmapLoaderFunction( const TQDomElement& e );
+    TQString getFormClassName( const TQDomElement& e );
+    TQString getClassName( const TQDomElement& e );
+    TQString getObjectName( const TQDomElement& e );
+    TQString getLayoutName( const TQDomElement& e );
+    TQString getInclude( const TQString& className );
+
+    TQString setObjectProperty( const TQString& objClass, const TQString& obj, const TQString &prop, const TQDomElement &e, bool stdset );
+
+    TQString registerObject( const TQString& name );
+    TQString registeredName( const TQString& name );
+    bool isObjectRegistered( const TQString& name );
+    TQStringList unique( const TQStringList& );
+
+    TQString trcall( const TQString& sourceText, const TQString& comment = "" );
+
+    static void embed( TQTextStream& out, const char* project, const TQStringList& images );
+
+    friend void getDBConnections(Uic& uic, TQString& s);
     static bool hasKDEwidget;
 
 private:
-    void registerLayouts ( const TTQDomElement& e );
-
-    TTQTextStream& out;
-    TTQTextOStream trout;
-    TTQString languageChangeBody;
-    TTQStringList objectNames;
-    TTQMap<TTQString,TTQString> objectMapper;
-    TTQStringList tags;
-    TTQStringList layouts;
-    TTQString formName;
-    TTQString lastItem;
-    TTQString trmacro;
+    void registerLayouts ( const TQDomElement& e );
+
+    TQTextStream& out;
+    TQTextOStream trout;
+    TQString languageChangeBody;
+    TQStringList objectNames;
+    TQMap<TQString,TQString> objectMapper;
+    TQStringList tags;
+    TQStringList layouts;
+    TQString formName;
+    TQString lastItem;
+    TQString trmacro;
 
     bool nofwd;
     static RubyIndent indent;
 
     struct Buddy
     {
-	Buddy( const TTQString& k, const TTQString& b )
+	Buddy( const TQString& k, const TQString& b )
 	    : key( k ), buddy( b ) {}
 	Buddy(){} // for valuelist
-	TTQString key;
-	TTQString buddy;
+	TQString key;
+	TQString buddy;
 	bool operator==( const Buddy& other ) const
 	    { return (key == other.key); }
     };
     struct CustomInclude
     {
-	TTQString header;
-	TTQString location;
+	TQString header;
+	TQString location;
     };
-    TTQValueList<Buddy> buddies;
+    TQValueList<Buddy> buddies;
 
-    TTQStringList layoutObjects;
-    bool isLayout( const TTQString& name ) const;
+    TQStringList layoutObjects;
+    bool isLayout( const TQString& name ) const;
 
     uint item_used : 1;
     uint cg_used : 1;
@@ -147,35 +147,35 @@ private:
     uint stdsetdef : 1;
     uint externPixmaps : 1;
 
-    TTQString uiFileVersion;
-    TTQString nameOfClass;
-    TTQString pixmapLoaderFunction;
+    TQString uiFileVersion;
+    TQString nameOfClass;
+    TQString pixmapLoaderFunction;
 
-    void registerDatabases( const TTQDomElement& e );
-    bool isWidgetInTable( const TTQDomElement& e, const TTQString& connection, const TTQString& table );
-    bool isFrameworkCodeGenerated( const TTQDomElement& e );
-    TTQString getDatabaseInfo( const TTQDomElement& e, const TTQString& tag );
-    void createFormImpl( const TTQDomElement& e, const TTQString& form, const TTQString& connection, const TTQString& table );
-    TTQStringList dbConnections;
-    TTQMap< TTQString, TTQStringList > dbCursors;
-    TTQMap< TTQString, TTQStringList > dbForms;
+    void registerDatabases( const TQDomElement& e );
+    bool isWidgetInTable( const TQDomElement& e, const TQString& connection, const TQString& table );
+    bool isFrameworkCodeGenerated( const TQDomElement& e );
+    TQString getDatabaseInfo( const TQDomElement& e, const TQString& tag );
+    void createFormImpl( const TQDomElement& e, const TQString& form, const TQString& connection, const TQString& table );
+    TQStringList dbConnections;
+    TQMap< TQString, TQStringList > dbCursors;
+    TQMap< TQString, TQStringList > dbForms;
 
     static bool isMainWindow;
-    static TTQString mkBool( bool b );
-    static TTQString mkBool( const TTQString& s );
-    bool toBool( const TTQString& s );
-    static TTQString fixString( const TTQString &str );
+    static TQString mkBool( bool b );
+    static TQString mkBool( const TQString& s );
+    bool toBool( const TQString& s );
+    static TQString fixString( const TQString &str );
     static bool onlyAscii;
-    static TTQString mkStdSet( const TTQString& prop );
-    static TTQString getComment( const TTQDomNode& n );
+    static TQString mkStdSet( const TQString& prop );
+    static TQString getComment( const TQDomNode& n );
     int defSpacing, defMargin;
-    TTQString fileName;
+    TQString fileName;
     bool writeSlotImpl;
 
-    bool isEmptyFunction( const TTQString& fname );
-    TTQMap<TTQString, TTQString> functionImpls;
+    bool isEmptyFunction( const TQString& fname );
+    TQMap<TQString, TQString> functionImpls;
 
-    void rubySlot(TTQStringList::Iterator &it);
+    void rubySlot(TQStringList::Iterator &it);
 };
 
 #endif