summaryrefslogtreecommitdiffstats
path: root/kdewidgets
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdewidgets
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdewidgets')
-rw-r--r--kdewidgets/README2
-rw-r--r--kdewidgets/kde.widgets4
-rw-r--r--kdewidgets/makekdewidgets.cpp30
-rw-r--r--kdewidgets/tests/test.widgets4
4 files changed, 20 insertions, 20 deletions
diff --git a/kdewidgets/README b/kdewidgets/README
index 7b5dcfa4a..eaa3de347 100644
--- a/kdewidgets/README
+++ b/kdewidgets/README
@@ -5,7 +5,7 @@ KDE Custom Widgets for Qt Designer 2
Summary:
========
-This directory tqcontains KDE custom widgets for designer 2 which comes with
+This directory contains KDE custom widgets for designer 2 which comes with
Qt 3. Just make sure your plugin path in qtconfig includes
$KDEDIR/lib/kde3/plugins . With the KDE build system nothing special
(i.e. editing the plugin path) is needed, as uic will automatically be
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index 1416b3f11..0503bac48 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -38,7 +38,7 @@ Group=Input (KDE)
[KDatePicker]
ToolTip=A date selection widget (KDE)
WhatsThis=Provides a widget for calendar date input
-ConstructorArgs=(parent, QDate::tqcurrentDate(), name)
+ConstructorArgs=(parent, QDate::currentDate(), name)
Group=Input (KDE)
[KDialog]
@@ -229,7 +229,7 @@ Group=Input (KDE)
[KDateTable]
IncludeFile=kdatetbl.h
Group=Input (KDE)
-ConstructorArgs=(parent, QDate::tqcurrentDate(), name)
+ConstructorArgs=(parent, QDate::currentDate(), name)
[KLanguageButton]
IncludeFile=klanguagebutton.h
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index fb005e1e7..c2339e5a1 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -47,7 +47,7 @@ static const char classDef[] = "#ifndef EMBED_IMAGES\n"
" TQPixmap pix(m_widgets[key].iconSet);\n"
"#else\n"
" TQPixmap pix(locate( \"data\", \n"
- " TQString::tqfromLatin1(\"%PluginNameLower/pics/\") + m_widgets[key].iconSet));\n"
+ " TQString::fromLatin1(\"%PluginNameLower/pics/\") + m_widgets[key].iconSet));\n"
"#endif\n"
" return TQIconSet(pix);\n"
" }\n"
@@ -81,17 +81,17 @@ static const char classDef[] = "#ifndef EMBED_IMAGES\n"
"%PluginName::%PluginName()\n"
"{\n"
" WidgetInfo widget;\n";
-static const char widgetDef[] = " widget.group = TQString::tqfromLatin1(\"%Group\");\n"
+static const char widgetDef[] = " widget.group = TQString::fromLatin1(\"%Group\");\n"
"#ifdef EMBED_IMAGES\n"
" widget.iconSet = TQPixmap(%Pixmap);\n"
"#else\n"
- " widget.iconSet = TQString::tqfromLatin1(\"%IconSet\");\n"
+ " widget.iconSet = TQString::fromLatin1(\"%IconSet\");\n"
"#endif\n"
- " widget.includeFile = TQString::tqfromLatin1(\"%IncludeFile\");\n"
- " widget.toolTip = TQString::tqfromLatin1(\"%ToolTip\");\n"
- " widget.whatsThis = TQString::tqfromLatin1(\"%WhatsThis\");\n"
+ " widget.includeFile = TQString::fromLatin1(\"%IncludeFile\");\n"
+ " widget.toolTip = TQString::fromLatin1(\"%ToolTip\");\n"
+ " widget.whatsThis = TQString::fromLatin1(\"%WhatsThis\");\n"
" widget.isContainer = %IsContainer;\n"
- " m_widgets.insert(TQString::tqfromLatin1(\"%Class\"), widget);\n";
+ " m_widgets.insert(TQString::fromLatin1(\"%Class\"), widget);\n";
static const char endCtor[] = " %Init\n"
"}\n"
"%PluginName::~%PluginName()\n"
@@ -100,7 +100,7 @@ static const char endCtor[] = " %Init\n"
"}\n"
"TQWidget *%PluginName::create(const TQString &key, TQWidget *parent, const char *name)\n"
"{\n";
-static const char widgetCreate[] = " if (key == TQString::tqfromLatin1(\"%Class\"))\n"
+static const char widgetCreate[] = " if (key == TQString::fromLatin1(\"%Class\"))\n"
" return new %ImplClass%ConstructorArgs;\n";
static const char endCreate[] = " return 0;\n"
"}\n"
@@ -172,7 +172,7 @@ void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileNam
for ( uint idx = 0; idx < includes.count(); ++idx )
ts << "#include <" << includes[ idx ] << ">" << endl;
TQStringList classes = input.groupList();
- classes.remove( classes.tqfind( "Global" ) );
+ classes.remove( classes.find( "Global" ) );
// Autogenerate widget includes here
for ( uint idx = 0; idx < classes.count(); ++idx )
ts << buildWidgetInclude( classes[ idx ], input ) << endl;
@@ -198,12 +198,12 @@ void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileNam
TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group ) {
input.setGroup( name );
TQMap<TQString, TQString> defMap;
- defMap.insert( "Group", input.readEntry( "Group", group ).tqreplace( "\"", "\\\"" ) );
- defMap.insert( "IconSet", input.readEntry( "IconSet", name.lower() + ".png" ).tqreplace( ":", "_" ) );
- defMap.insert( "Pixmap", name.lower().tqreplace( ":", "_" ) + "_xpm" );
+ defMap.insert( "Group", input.readEntry( "Group", group ).replace( "\"", "\\\"" ) );
+ defMap.insert( "IconSet", input.readEntry( "IconSet", name.lower() + ".png" ).replace( ":", "_" ) );
+ defMap.insert( "Pixmap", name.lower().replace( ":", "_" ) + "_xpm" );
defMap.insert( "IncludeFile", input.readEntry( "IncludeFile", name.lower() + ".h" ).remove( ":" ) );
- defMap.insert( "ToolTip", input.readEntry( "ToolTip", name + " Widget" ).tqreplace( "\"", "\\\"" ) );
- defMap.insert( "WhatsThis", input.readEntry( "WhatsThis", name + " Widget" ).tqreplace( "\"", "\\\"" ) );
+ defMap.insert( "ToolTip", input.readEntry( "ToolTip", name + " Widget" ).replace( "\"", "\\\"" ) );
+ defMap.insert( "WhatsThis", input.readEntry( "WhatsThis", name + " Widget" ).replace( "\"", "\\\"" ) );
defMap.insert( "IsContainer", input.readEntry( "IsContainer", "false" ) );
defMap.insert( "Class", name );
return KMacroExpander::expandMacros( widgetDef, defMap );
@@ -225,7 +225,7 @@ TQString buildWidgetInclude( const TQString &name, KConfig &input ) {
TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath ) {
input.setGroup( name );
- TQString cleanName = name.lower().tqreplace( ":", "_" );
+ TQString cleanName = name.lower().replace( ":", "_" );
TQString iconName = input.readEntry( "IconSet", cleanName + ".png" );
TQFileInfo fi( iconPath + "/" + iconName );
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index f198bb137..b67abedee 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -38,7 +38,7 @@ Group=Input (KDE)
[KDatePicker]
ToolTip=A date selection widget (KDE)
WhatsThis=Provides a widget for calendar date input
-ConstructorArgs=(parent, QDate::tqcurrentDate(), name)
+ConstructorArgs=(parent, QDate::currentDate(), name)
Group=Input (KDE)
[KDialog]
@@ -218,7 +218,7 @@ Group=Input (KDE)
[KDateTable]
IncludeFile=kdatetbl.h
Group=Input (KDE)
-ConstructorArgs=(parent, QDate::tqcurrentDate(), name)
+ConstructorArgs=(parent, QDate::currentDate(), name)
[KLanguageButton]
IncludeFile=klanguagebutton.h