summaryrefslogtreecommitdiffstats
path: root/kdewidgets
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /kdewidgets
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kdewidgets')
-rw-r--r--kdewidgets/kde.widgets2
-rw-r--r--kdewidgets/makekdewidgets.cpp18
-rw-r--r--kdewidgets/tests/test.widgets2
3 files changed, 11 insertions, 11 deletions
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index 8ca72586d..0a4bf6229 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -26,7 +26,7 @@ Group=Graphics (KDE)
ToolTip=Combo Box (KDE)
Group=Input (KDE)
-[KCModule]
+[TDECModule]
ToolTip=KControl Center Module (KDE)
IsContainer=true
Group=Container (KDE)
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index bec6988b3..8e2856c53 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -117,11 +117,11 @@ static KCmdLineOptions options[] =
KCmdLineLastOption
};
-static TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group );
-static TQString buildWidgetCreate( const TQString &name, KConfig &input );
-static TQString buildWidgetInclude( const TQString &name, KConfig &input );
+static TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group );
+static TQString buildWidgetCreate( const TQString &name, TDEConfig &input );
+static TQString buildWidgetInclude( const TQString &name, TDEConfig &input );
static void buildFile( TQTextStream &stream, const TQString& group, const TQString& fileName, const TQString& pluginName, const TQString& iconPath );
-static TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath );
+static TQString buildPixmap( const TQString &name, TDEConfig &input, const TQString &iconPath );
int main( int argc, char **argv ) {
new TDEInstance( "makekdewidgets" );
@@ -160,7 +160,7 @@ int main( int argc, char **argv ) {
}
void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileName, const TQString& pluginName, const TQString& iconPath ) {
- KConfig input( fileName, true, false );
+ TDEConfig input( fileName, true, false );
input.setGroup( "Global" );
TQMap<TQString, TQString> MainMap;
MainMap.insert( "PluginName", input.readEntry( "PluginName", pluginName ) );
@@ -195,7 +195,7 @@ void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileNam
}
-TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group ) {
+TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group ) {
input.setGroup( name );
TQMap<TQString, TQString> defMap;
defMap.insert( "Group", input.readEntry( "Group", group ).replace( "\"", "\\\"" ) );
@@ -209,7 +209,7 @@ TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &g
return KMacroExpander::expandMacros( widgetDef, defMap );
}
-TQString buildWidgetCreate( const TQString &name, KConfig &input ) {
+TQString buildWidgetCreate( const TQString &name, TDEConfig &input ) {
input.setGroup( name );
TQMap<TQString, TQString> createMap;
createMap.insert( "ImplClass", input.readEntry( "ImplClass", name ) );
@@ -218,12 +218,12 @@ TQString buildWidgetCreate( const TQString &name, KConfig &input ) {
return KMacroExpander::expandMacros( widgetCreate, createMap );
}
-TQString buildWidgetInclude( const TQString &name, KConfig &input ) {
+TQString buildWidgetInclude( const TQString &name, TDEConfig &input ) {
input.setGroup( name );
return "#include <" + input.readEntry( "IncludeFile", name.lower() + ".h" ) + ">";
}
-TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath ) {
+TQString buildPixmap( const TQString &name, TDEConfig &input, const TQString &iconPath ) {
input.setGroup( name );
TQString cleanName = name.lower().replace( ":", "_" );
TQString iconName = input.readEntry( "IconSet", cleanName + ".png" );
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index d375f0add..ed320bc64 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -26,7 +26,7 @@ Group=Graphics (KDE)
ToolTip=Combo Box (KDE)
Group=Input (KDE)
-[KCModule]
+[TDECModule]
ToolTip=KControl Center Module (KDE)
IsContainer=true
Group=Container (KDE)