CVS commit by antlarr: Don't use deprecated methods in the templates for new applications. M +2 -2 kapp/app.cpp 1.5 M +1 -1 kpartapp/app.cpp 1.5 M +1 -1 kpartplugin/plugin_app.cpp 1.4 M +1 -1 kxt/app.cpp 1.4 --- kdevelop/languages/cpp/app_templates/kapp/app.cpp #1.4:1.5 @@ -204,5 +204,5 @@ void %{APPNAME}::fileSaveAs() // this slot is called whenever the File->Save As menu is selected, KURL file_url = KFileDialog::getSaveURL(); - if (!file_url.isEmpty() && !file_url.isMalformed()) + if (!file_url.isEmpty() && file_url.isValid()) { // save your info, here @@ -255,5 +255,5 @@ void %{APPNAME}::optionsShowStatusbar() void %{APPNAME}::optionsConfigureKeys() { - KKeyDialog::configureKeys(actionCollection(), "%{APPNAMELC}ui.rc"); + KKeyDialog::configure(actionCollection()); } --- kdevelop/languages/cpp/app_templates/kpartapp/app.cpp #1.4:1.5 @@ -143,5 +143,5 @@ void %{APPNAME}::optionsShowStatusbar() void %{APPNAME}::optionsConfigureKeys() { - KKeyDialog::configureKeys(actionCollection(), "%{APPNAMELC}_shell.rc"); + KKeyDialog::configure(actionCollection()); } --- kdevelop/languages/cpp/app_templates/kpartplugin/plugin_app.cpp #1.3:1.4 @@ -48,5 +48,5 @@ void Plugin%{APPNAME}::slotAction() // This is a standard check to make sure we are dealing with a // valid URL - if ( url.isMalformed() ) + if ( !url.isValid() ) { QString title( i18n( "Malformed URL" ) ); --- kdevelop/languages/cpp/app_templates/kxt/app.cpp #1.3:1.4 @@ -109,5 +109,5 @@ void %{APPNAME}::optionsShowStatusbar() void %{APPNAME}::optionsConfigureKeys() { - KKeyDialog::configureKeys(actionCollection(), "%{APPNAMELC}ui.rc"); + KKeyDialog::configure(actionCollection()); }