diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
| commit | 8f7ac92d27834427c1fa2a4a350d70d05529bbf4 (patch) | |
| tree | fc53a45a5d9693bfe8a156579b921e960351e31c /korundum | |
| parent | 427847240b11c1733dd9c259c613d68a6405fe68 (diff) | |
| download | tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.tar.gz tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'korundum')
| -rwxr-xr-x | korundum/rubylib/examples/RubberDoc.rb | 2 | ||||
| -rw-r--r-- | korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp | 6 | ||||
| -rw-r--r-- | korundum/rubylib/templates/annotated/menuapp2.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/korundum/rubylib/examples/RubberDoc.rb b/korundum/rubylib/examples/RubberDoc.rb index f7b88255..1b196999 100755 --- a/korundum/rubylib/examples/RubberDoc.rb +++ b/korundum/rubylib/examples/RubberDoc.rb @@ -1252,7 +1252,7 @@ wierd khtml bug @rightpane.setResizeMode @viewed, TQt::Splitter::KeepSize in order to use KURL's as constants one must place this TDEApplication init -at the top of the file otherwise KInstance isn't init'ed before KURL usage +at the top of the file otherwise TDEInstance isn't init'ed before KURL usage class ProjectSelectDialog < KDE::DialogBase def initialize parent=nil,name=nil,caption=nil diff --git a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp index 4512eeaf..9dd04565 100644 --- a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp +++ b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp @@ -801,8 +801,8 @@ TQString userTextsFunctions( CfgEntry *e, TQString itemVarStr=TQString::null, TQ int main( int argc, char **argv ) { - KAboutData aboutData( "rbkconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3", - I18N_NOOP("Ruby KConfig Compiler") , KAboutData::License_LGPL ); + TDEAboutData aboutData( "rbkconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3", + I18N_NOOP("Ruby KConfig Compiler") , TDEAboutData::License_LGPL ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); aboutData.addAuthor( "Waldo Bastian", 0, "bastian@kde.org" ); aboutData.addAuthor( "Zack Rusin", 0, "zack@kde.org" ); @@ -814,7 +814,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KInstance app( &aboutData ); + TDEInstance app( &aboutData ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/korundum/rubylib/templates/annotated/menuapp2.rb b/korundum/rubylib/templates/annotated/menuapp2.rb index 2deca4a5..cf79d572 100644 --- a/korundum/rubylib/templates/annotated/menuapp2.rb +++ b/korundum/rubylib/templates/annotated/menuapp2.rb @@ -147,7 +147,7 @@ class MainWin < KDE::MainWindow @specialAction.plug(editMenu) menuBar().insertItem(i18n("&Edit"), editMenu) - # Uses the info from KAboutData (specified below) + # Uses the info from TDEAboutData (specified below) # to construct the "About" box in the Help menu helpMenu = helpMenu("") |