diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kdewidgets | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdewidgets')
| -rw-r--r-- | kdewidgets/kde.widgets | 2 | ||||
| -rw-r--r-- | kdewidgets/makekdewidgets.cpp | 4 | ||||
| -rw-r--r-- | kdewidgets/tests/test.widgets | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets index bce813f8d..8ca72586d 100644 --- a/kdewidgets/kde.widgets +++ b/kdewidgets/kde.widgets @@ -1,7 +1,7 @@ [Global] PluginName=KDEWidgets Includes=kinstance.h,classpreviews.h -Init=new KInstance("kdewidgets"); +Init=new TDEInstance("kdewidgets"); [KActiveLabel] ToolTip=Active Label (KDE) diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp index 8c5577354..bec6988b3 100644 --- a/kdewidgets/makekdewidgets.cpp +++ b/kdewidgets/makekdewidgets.cpp @@ -124,9 +124,9 @@ static void buildFile( TQTextStream &stream, const TQString& group, const TQStri static TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath ); int main( int argc, char **argv ) { - new KInstance( "makekdewidgets" ); + new TDEInstance( "makekdewidgets" ); - KAboutData about( "makekdewidgets", I18N_NOOP( "makekdewidgets" ), version, description, KAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "[email protected]" ); + TDEAboutData about( "makekdewidgets", I18N_NOOP( "makekdewidgets" ), version, description, TDEAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "[email protected]" ); about.addAuthor( "ian reinhart geiser", 0, "[email protected]" ); TDECmdLineArgs::init( argc, argv, &about ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets index b67abedee..d375f0add 100644 --- a/kdewidgets/tests/test.widgets +++ b/kdewidgets/tests/test.widgets @@ -1,7 +1,7 @@ [Global] PluginName=KDEWidgets Includes=kinstance.h,classpreviews.h -Init=new KInstance("kdewidgets"); +Init=new TDEInstance("kdewidgets"); [KActiveLabel] ToolTip=Active Label (KDE) |