Skip to content

C
core
Kaydet (Commit) 9212fadc authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:useuniqueptr in OGenericAdministrationPage 

Change-Id: I3028aa7d40b5fea763a93b54bf5f4c5bc4294822
Reviewed-on: https://gerrit.libreoffice.org/60193
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst d34098cd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 131 deletions
dbaccess/source/ui/dlg/ConnectionHelper.cxx
Dosyayı görüntüle @ 9212fadc
...@@ -657,16 +657,16 @@ namespace dbaui ...@@ -657,16 +657,16 @@ namespace dbaui
return true; return true;
} }
void OConnectionHelper::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) void OConnectionHelper::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pFT_Connection)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pFT_Connection));
_rControlList.push_back(new ODisableWrapper<PushButton>(m_pPB_Connection)); _rControlList.emplace_back(new ODisableWrapper<PushButton>(m_pPB_Connection));
_rControlList.push_back(new ODisableWrapper<PushButton>(m_pPB_CreateDB)); _rControlList.emplace_back(new ODisableWrapper<PushButton>(m_pPB_CreateDB));
} }
void OConnectionHelper::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) void OConnectionHelper::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
_rControlList.push_back( new OSaveValueWrapper<Edit>( m_pConnectionURL ) ); _rControlList.emplace_back( new OSaveValueWrapper<Edit>( m_pConnectionURL ) );
} }
bool OConnectionHelper::commitURL() bool OConnectionHelper::commitURL()
......
dbaccess/source/ui/dlg/ConnectionHelper.hxx
Dosyayı görüntüle @ 9212fadc
...@@ -57,9 +57,9 @@ namespace dbaui ...@@ -57,9 +57,9 @@ namespace dbaui
virtual bool PreNotify( NotifyEvent& _rNEvt ) override; virtual bool PreNotify( NotifyEvent& _rNEvt ) override;
// <method>OGenericAdministrationPage::fillControls</method> // <method>OGenericAdministrationPage::fillControls</method>
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
// <method>OGenericAdministrationPage::fillWindows</method> // <method>OGenericAdministrationPage::fillWindows</method>
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
// setting/retrieving the current connection URL // setting/retrieving the current connection URL
......
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
Dosyayı görüntüle @ 9212fadc
...@@ -48,8 +48,8 @@ namespace dbaui ...@@ -48,8 +48,8 @@ namespace dbaui
private: private:
VclPtr<CheckBox> m_pPasswordrequired; VclPtr<CheckBox> m_pPasswordrequired;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
}; };
// OTextConnectionPage // OTextConnectionPage
...@@ -66,8 +66,8 @@ namespace dbaui ...@@ -66,8 +66,8 @@ namespace dbaui
protected: protected:
virtual bool prepareLeave() override; virtual bool prepareLeave() override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
bool checkTestConnection() override; bool checkTestConnection() override;
private: private:
...@@ -87,8 +87,8 @@ namespace dbaui ...@@ -87,8 +87,8 @@ namespace dbaui
protected: protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
private: private:
VclPtr<FixedText> m_pFTHelpText; VclPtr<FixedText> m_pFTHelpText;
...@@ -117,8 +117,8 @@ namespace dbaui ...@@ -117,8 +117,8 @@ namespace dbaui
static VclPtr<OGenericAdministrationPage> Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); static VclPtr<OGenericAdministrationPage> Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
protected: protected:
virtual void fillControls( std::vector< ISaveValueWrapper* >& _rControlList ) override; virtual void fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList ) override;
virtual void fillWindows( std::vector< ISaveValueWrapper* >& _rControlList ) override; virtual void fillWindows( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList ) override;
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
...@@ -145,8 +145,8 @@ namespace dbaui ...@@ -145,8 +145,8 @@ namespace dbaui
private: private:
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void callModifiedHdl(void* pControl = nullptr) override; virtual void callModifiedHdl(void* pControl = nullptr) override;
DECL_LINK(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnTestJavaClickHdl, Button*, void);
...@@ -182,8 +182,8 @@ namespace dbaui ...@@ -182,8 +182,8 @@ namespace dbaui
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
DECL_LINK(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnTestJavaClickHdl, Button*, void);
DECL_LINK(OnEditModified, Edit&, void); DECL_LINK(OnEditModified, Edit&, void);
...@@ -214,8 +214,8 @@ namespace dbaui ...@@ -214,8 +214,8 @@ namespace dbaui
protected: protected:
virtual bool FillItemSet(SfxItemSet* _rSet) override; virtual bool FillItemSet(SfxItemSet* _rSet) override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
private: private:
VclPtr<RadioButton> m_pODBCDatabase; VclPtr<RadioButton> m_pODBCDatabase;
...@@ -245,8 +245,8 @@ namespace dbaui ...@@ -245,8 +245,8 @@ namespace dbaui
VclPtr<PushButton> m_pPBTestConnection; VclPtr<PushButton> m_pPBTestConnection;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
}; };
// OFinalDBPageSetup // OFinalDBPageSetup
...@@ -276,8 +276,8 @@ namespace dbaui ...@@ -276,8 +276,8 @@ namespace dbaui
DECL_LINK(OnOpenSelected, Button*, void); DECL_LINK(OnOpenSelected, Button*, void);
protected: protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
}; };
} // namespace dbaui } // namespace dbaui
......
dbaccess/source/ui/dlg/TextConnectionHelper.cxx
Dosyayı görüntüle @ 9212fadc
...@@ -181,25 +181,25 @@ namespace dbaui ...@@ -181,25 +181,25 @@ namespace dbaui
m_aGetExtensionHandler.Call(this); m_aGetExtensionHandler.Call(this);
} }
void OTextConnectionHelper::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) void OTextConnectionHelper::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
_rControlList.push_back(new OSaveValueWrapper<ComboBox>(m_pFieldSeparator)); _rControlList.emplace_back(new OSaveValueWrapper<ComboBox>(m_pFieldSeparator));
_rControlList.push_back(new OSaveValueWrapper<ComboBox>(m_pTextSeparator)); _rControlList.emplace_back(new OSaveValueWrapper<ComboBox>(m_pTextSeparator));
_rControlList.push_back(new OSaveValueWrapper<ComboBox>(m_pDecimalSeparator)); _rControlList.emplace_back(new OSaveValueWrapper<ComboBox>(m_pDecimalSeparator));
_rControlList.push_back(new OSaveValueWrapper<ComboBox>(m_pThousandsSeparator)); _rControlList.emplace_back(new OSaveValueWrapper<ComboBox>(m_pThousandsSeparator));
_rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pRowHeader)); _rControlList.emplace_back(new OSaveValueWrapper<CheckBox>(m_pRowHeader));
_rControlList.push_back(new OSaveValueWrapper<ListBox>(m_pCharSet)); _rControlList.emplace_back(new OSaveValueWrapper<ListBox>(m_pCharSet));
} }
void OTextConnectionHelper::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) void OTextConnectionHelper::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pFieldSeparatorLabel)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pFieldSeparatorLabel));
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pTextSeparatorLabel)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pTextSeparatorLabel));
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pDecimalSeparatorLabel)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pDecimalSeparatorLabel));
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pThousandsSeparatorLabel)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pThousandsSeparatorLabel));
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pCharSetHeader)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pCharSetHeader));
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pCharSetLabel)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pCharSetLabel));
_rControlList.push_back(new ODisableWrapper<ListBox>(m_pCharSet)); _rControlList.emplace_back(new ODisableWrapper<ListBox>(m_pCharSet));
} }
void OTextConnectionHelper::implInitControls(const SfxItemSet& _rSet, bool _bValid) void OTextConnectionHelper::implInitControls(const SfxItemSet& _rSet, bool _bValid)
......
dbaccess/source/ui/dlg/TextConnectionHelper.hxx
Dosyayı görüntüle @ 9212fadc
...@@ -84,8 +84,8 @@ namespace dbaui ...@@ -84,8 +84,8 @@ namespace dbaui
public: public:
void implInitControls(const SfxItemSet& _rSet, bool _bValid); void implInitControls(const SfxItemSet& _rSet, bool _bValid);
void fillControls(std::vector< ISaveValueWrapper* >& _rControlList); void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList);
void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList); void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList);
void SetClickHandler(const Link<OTextConnectionHelper*, void>& _rHandler) { m_aGetExtensionHandler = _rHandler; } void SetClickHandler(const Link<OTextConnectionHelper*, void>& _rHandler) { m_aGetExtensionHandler = _rHandler; }
OUString GetExtension(); OUString GetExtension();
bool FillItemSet( SfxItemSet& rSet, const bool bChangedSomething ); bool FillItemSet( SfxItemSet& rSet, const bool bChangedSomething );
......
dbaccess/source/ui/dlg/UserAdmin.cxx
Dosyayı görüntüle @ 9212fadc
...@@ -290,11 +290,11 @@ OUString OUserAdmin::GetUser() ...@@ -290,11 +290,11 @@ OUString OUserAdmin::GetUser()
return m_pUSER->GetSelectedEntry(); return m_pUSER->GetSelectedEntry();
} }
void OUserAdmin::fillControls(std::vector< ISaveValueWrapper* >& /*_rControlList*/) void OUserAdmin::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& /*_rControlList*/)
{ {
} }
void OUserAdmin::fillWindows(std::vector< ISaveValueWrapper* >& /*_rControlList*/) void OUserAdmin::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& /*_rControlList*/)
{ {
} }
......
dbaccess/source/ui/dlg/UserAdmin.hxx
Dosyayı görüntüle @ 9212fadc
...@@ -70,10 +70,10 @@ public: ...@@ -70,10 +70,10 @@ public:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
// <method>OGenericAdministrationPage::fillControls</method> // <method>OGenericAdministrationPage::fillControls</method>
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
// <method>OGenericAdministrationPage::fillWindows</method> // <method>OGenericAdministrationPage::fillWindows</method>
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
}; };
} }
#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_USERADMIN_HXX #endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_USERADMIN_HXX
......
dbaccess/source/ui/dlg/admincontrols.cxx
Dosyayı görüntüle @ 9212fadc
...@@ -200,23 +200,23 @@ namespace dbaui ...@@ -200,23 +200,23 @@ namespace dbaui
TabPage::dispose(); TabPage::dispose();
} }
void MySQLNativeSettings::fillControls( std::vector< ISaveValueWrapper* >& _rControlList ) void MySQLNativeSettings::fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList )
{ {
_rControlList.push_back( new OSaveValueWrapper< Edit >( m_pDatabaseName ) ); _rControlList.emplace_back( new OSaveValueWrapper< Edit >( m_pDatabaseName ) );
_rControlList.push_back( new OSaveValueWrapper< Edit >( m_pHostName ) ); _rControlList.emplace_back( new OSaveValueWrapper< Edit >( m_pHostName ) );
_rControlList.push_back( new OSaveValueWrapper< Edit >( m_pPort ) ); _rControlList.emplace_back( new OSaveValueWrapper< Edit >( m_pPort ) );
_rControlList.push_back( new OSaveValueWrapper< Edit >( m_pSocket ) ); _rControlList.emplace_back( new OSaveValueWrapper< Edit >( m_pSocket ) );
_rControlList.push_back( new OSaveValueWrapper< Edit >( m_pNamedPipe ) ); _rControlList.emplace_back( new OSaveValueWrapper< Edit >( m_pNamedPipe ) );
} }
void MySQLNativeSettings::fillWindows( std::vector< ISaveValueWrapper* >& _rControlList ) void MySQLNativeSettings::fillWindows( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList )
{ {
_rControlList.push_back( new ODisableWrapper< FixedText >( m_pDatabaseNameLabel ) ); _rControlList.emplace_back( new ODisableWrapper< FixedText >( m_pDatabaseNameLabel ) );
_rControlList.push_back( new ODisableWrapper< FixedText >( m_pHostNameLabel ) ); _rControlList.emplace_back( new ODisableWrapper< FixedText >( m_pHostNameLabel ) );
_rControlList.push_back( new ODisableWrapper< FixedText >( m_pPortLabel ) ); _rControlList.emplace_back( new ODisableWrapper< FixedText >( m_pPortLabel ) );
_rControlList.push_back( new ODisableWrapper< FixedText >( m_pDefaultPort ) ); _rControlList.emplace_back( new ODisableWrapper< FixedText >( m_pDefaultPort ) );
_rControlList.push_back( new ODisableWrapper< RadioButton >( m_pSocketRadio ) ); _rControlList.emplace_back( new ODisableWrapper< RadioButton >( m_pSocketRadio ) );
_rControlList.push_back( new ODisableWrapper< RadioButton >( m_pNamedPipeRadio ) ); _rControlList.emplace_back( new ODisableWrapper< RadioButton >( m_pNamedPipeRadio ) );
} }
bool MySQLNativeSettings::FillItemSet( SfxItemSet* _rSet ) bool MySQLNativeSettings::FillItemSet( SfxItemSet* _rSet )
......
dbaccess/source/ui/dlg/admincontrols.hxx
Dosyayı görüntüle @ 9212fadc
...@@ -57,8 +57,8 @@ namespace dbaui ...@@ -57,8 +57,8 @@ namespace dbaui
MySQLNativeSettings( vcl::Window& _rParent, const Link<void*,void>& _rControlModificationLink ); MySQLNativeSettings( vcl::Window& _rParent, const Link<void*,void>& _rControlModificationLink );
virtual ~MySQLNativeSettings() override; virtual ~MySQLNativeSettings() override;
virtual void dispose() override; virtual void dispose() override;
void fillControls( std::vector< ISaveValueWrapper* >& _rControlList ); void fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList );
void fillWindows( std::vector< ISaveValueWrapper* >& _rControlList ); void fillWindows( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList );
bool FillItemSet( SfxItemSet* _rCoreAttrs ); bool FillItemSet( SfxItemSet* _rCoreAttrs );
void implInitControls( const SfxItemSet& _rSet ); void implInitControls( const SfxItemSet& _rSet );
......
dbaccess/source/ui/dlg/adminpages.cxx
Dosyayı görüntüle @ 9212fadc
...@@ -155,7 +155,7 @@ namespace dbaui ...@@ -155,7 +155,7 @@ namespace dbaui
bool bValid, bReadonly; bool bValid, bReadonly;
getFlags(_rSet, bValid, bReadonly); getFlags(_rSet, bValid, bReadonly);
std::vector< ISaveValueWrapper* > aControlList; std::vector< std::unique_ptr<ISaveValueWrapper> > aControlList;
if ( _bSaveValue ) if ( _bSaveValue )
{ {
fillControls(aControlList); fillControls(aControlList);
...@@ -173,12 +173,6 @@ namespace dbaui ...@@ -173,12 +173,6 @@ namespace dbaui
pValueWrapper->Disable(); pValueWrapper->Disable();
} }
} }
for( const auto& pValueWrapper : aControlList )
{
delete pValueWrapper;
}
aControlList.clear();
} }
void OGenericAdministrationPage::initializePage() void OGenericAdministrationPage::initializePage()
......
dbaccess/source/ui/dlg/adminpages.hxx
Dosyayı görüntüle @ 9212fadc
...@@ -152,16 +152,16 @@ namespace dbaui ...@@ -152,16 +152,16 @@ namespace dbaui
/** will be called inside <method>implInitControls</method> to save the value if necessary /** will be called inside <method>implInitControls</method> to save the value if necessary
@param _rControlList @param _rControlList
The list must be filled with the controls. The list must be filled with the controls.
It is not allowed to clear the list before pusching data into it. It is not allowed to clear the list before pushing data into it.
*/ */
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) = 0; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) = 0;
/** will be called inside <method>implInitControls</method> to disable if necessary /** will be called inside <method>implInitControls</method> to disable if necessary
@param _rControlList @param _rControlList
The list must be filled with the controls. The list must be filled with the controls.
It is not allowed to clear the list before pusching data into it. It is not allowed to clear the list before pushing data into it.
*/ */
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) = 0; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) = 0;
public: public:
/** fills the Boolean value into the item set when the value changed. /** fills the Boolean value into the item set when the value changed.
......
dbaccess/source/ui/dlg/advancedsettings.cxx
Dosyayı görüntüle @ 9212fadc
...@@ -194,32 +194,32 @@ namespace dbaui ...@@ -194,32 +194,32 @@ namespace dbaui
} }
} }
void SpecialSettingsPage::fillWindows( std::vector< ISaveValueWrapper* >& _rControlList ) void SpecialSettingsPage::fillWindows( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList )
{ {
if ( m_bHasBooleanComparisonMode ) if ( m_bHasBooleanComparisonMode )
{ {
_rControlList.push_back( new ODisableWrapper< FixedText >( m_pBooleanComparisonModeLabel ) ); _rControlList.emplace_back( new ODisableWrapper< FixedText >( m_pBooleanComparisonModeLabel ) );
} }
if ( m_bHasMaxRowScan ) if ( m_bHasMaxRowScan )
{ {
_rControlList.push_back( new ODisableWrapper< FixedText >( m_pMaxRowScanLabel ) ); _rControlList.emplace_back( new ODisableWrapper< FixedText >( m_pMaxRowScanLabel ) );
} }
} }
void SpecialSettingsPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) void SpecialSettingsPage::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
for (auto const& booleanSetting : m_aBooleanSettings) for (auto const& booleanSetting : m_aBooleanSettings)
{ {
if ( *booleanSetting.ppControl ) if ( *booleanSetting.ppControl )
{ {
_rControlList.push_back( new OSaveValueWrapper< CheckBox >( *booleanSetting.ppControl ) ); _rControlList.emplace_back( new OSaveValueWrapper< CheckBox >( *booleanSetting.ppControl ) );
} }
} }
if ( m_bHasBooleanComparisonMode ) if ( m_bHasBooleanComparisonMode )
_rControlList.push_back( new OSaveValueWrapper< ListBox >( m_pBooleanComparisonMode ) ); _rControlList.emplace_back( new OSaveValueWrapper< ListBox >( m_pBooleanComparisonMode ) );
if ( m_bHasMaxRowScan ) if ( m_bHasMaxRowScan )
_rControlList.push_back(new OSaveValueWrapper<NumericField>(m_pMaxRowScan)); _rControlList.emplace_back(new OSaveValueWrapper<NumericField>(m_pMaxRowScan));
} }
void SpecialSettingsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) void SpecialSettingsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
...@@ -349,16 +349,16 @@ namespace dbaui ...@@ -349,16 +349,16 @@ namespace dbaui
OGenericAdministrationPage::dispose(); OGenericAdministrationPage::dispose();
} }
void GeneratedValuesPage::fillWindows( std::vector< ISaveValueWrapper* >& _rControlList ) void GeneratedValuesPage::fillWindows( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList )
{ {
_rControlList.push_back( new ODisableWrapper< VclFrame >( m_pAutoFrame ) ); _rControlList.emplace_back( new ODisableWrapper< VclFrame >( m_pAutoFrame ) );
} }
void GeneratedValuesPage::fillControls( std::vector< ISaveValueWrapper* >& _rControlList ) void GeneratedValuesPage::fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList )
{ {
_rControlList.push_back( new OSaveValueWrapper< CheckBox >( m_pAutoRetrievingEnabled ) ); _rControlList.emplace_back( new OSaveValueWrapper< CheckBox >( m_pAutoRetrievingEnabled ) );
_rControlList.push_back( new OSaveValueWrapper< Edit >( m_pAutoIncrement ) ); _rControlList.emplace_back( new OSaveValueWrapper< Edit >( m_pAutoIncrement ) );
_rControlList.push_back( new OSaveValueWrapper< Edit >( m_pAutoRetrieving ) ); _rControlList.emplace_back( new OSaveValueWrapper< Edit >( m_pAutoRetrieving ) );
} }
void GeneratedValuesPage::implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) void GeneratedValuesPage::implInitControls( const SfxItemSet& _rSet, bool _bSaveValue )
......
dbaccess/source/ui/dlg/advancedsettings.hxx
Dosyayı görüntüle @ 9212fadc
...@@ -83,10 +83,10 @@ namespace dbaui ...@@ -83,10 +83,10 @@ namespace dbaui
virtual void implInitControls (const SfxItemSet& _rSet, bool _bSaveValue ) override; virtual void implInitControls (const SfxItemSet& _rSet, bool _bSaveValue ) override;
// <method>OGenericAdministrationPage::fillControls</method> // <method>OGenericAdministrationPage::fillControls</method>
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
// <method>OGenericAdministrationPage::fillWindows</method> // <method>OGenericAdministrationPage::fillWindows</method>
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
void impl_initBooleanSettings(); void impl_initBooleanSettings();
DECL_LINK(BooleanComparisonSelectHdl, ListBox&, void); DECL_LINK(BooleanComparisonSelectHdl, ListBox&, void);
...@@ -119,10 +119,10 @@ namespace dbaui ...@@ -119,10 +119,10 @@ namespace dbaui
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
// <method>OGenericAdministrationPage::fillControls</method> // <method>OGenericAdministrationPage::fillControls</method>
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
// <method>OGenericAdministrationPage::fillWindows</method> // <method>OGenericAdministrationPage::fillWindows</method>
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
}; };
} }
......
dbaccess/source/ui/dlg/detailpages.cxx
Dosyayı görüntüle @ 9212fadc
...@@ -116,25 +116,25 @@ namespace dbaui ...@@ -116,25 +116,25 @@ namespace dbaui
OGenericAdministrationPage::dispose(); OGenericAdministrationPage::dispose();
} }
void OCommonBehaviourTabPage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) void OCommonBehaviourTabPage::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions) if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions)
{ {
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pOptionsLabel)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pOptionsLabel));
} }
if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseCharset) if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseCharset)
{ {
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pCharsetLabel)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pCharsetLabel));
} }
} }
void OCommonBehaviourTabPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) void OCommonBehaviourTabPage::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions) if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions)
_rControlList.push_back(new OSaveValueWrapper<Edit>(m_pOptions)); _rControlList.emplace_back(new OSaveValueWrapper<Edit>(m_pOptions));
if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseCharset) if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseCharset)
_rControlList.push_back(new OSaveValueWrapper<ListBox>(m_pCharset)); _rControlList.emplace_back(new OSaveValueWrapper<ListBox>(m_pCharset));
} }
void OCommonBehaviourTabPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) void OCommonBehaviourTabPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
...@@ -360,18 +360,18 @@ namespace dbaui ...@@ -360,18 +360,18 @@ namespace dbaui
return bChangedSomething; return bChangedSomething;
} }
void OUserDriverDetailsPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) void OUserDriverDetailsPage::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
OCommonBehaviourTabPage::fillControls(_rControlList); OCommonBehaviourTabPage::fillControls(_rControlList);
_rControlList.push_back(new OSaveValueWrapper<Edit>(m_pEDHostname)); _rControlList.emplace_back(new OSaveValueWrapper<Edit>(m_pEDHostname));
_rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pUseCatalog)); _rControlList.emplace_back(new OSaveValueWrapper<CheckBox>(m_pUseCatalog));
_rControlList.push_back(new OSaveValueWrapper<NumericField>(m_pNFPortNumber)); _rControlList.emplace_back(new OSaveValueWrapper<NumericField>(m_pNFPortNumber));
} }
void OUserDriverDetailsPage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) void OUserDriverDetailsPage::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
OCommonBehaviourTabPage::fillWindows(_rControlList); OCommonBehaviourTabPage::fillWindows(_rControlList);
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHostname)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pFTHostname));
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pPortNumber)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pPortNumber));
} }
void OUserDriverDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) void OUserDriverDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
{ {
...@@ -585,22 +585,22 @@ namespace dbaui ...@@ -585,22 +585,22 @@ namespace dbaui
OCommonBehaviourTabPage::dispose(); OCommonBehaviourTabPage::dispose();
} }
void MySQLNativePage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) void MySQLNativePage::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
OCommonBehaviourTabPage::fillControls( _rControlList ); OCommonBehaviourTabPage::fillControls( _rControlList );
m_aMySQLSettings->fillControls( _rControlList ); m_aMySQLSettings->fillControls( _rControlList );
_rControlList.push_back(new OSaveValueWrapper<Edit>(m_pUserName)); _rControlList.emplace_back(new OSaveValueWrapper<Edit>(m_pUserName));
_rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pPasswordRequired)); _rControlList.emplace_back(new OSaveValueWrapper<CheckBox>(m_pPasswordRequired));
} }
void MySQLNativePage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) void MySQLNativePage::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
OCommonBehaviourTabPage::fillWindows( _rControlList ); OCommonBehaviourTabPage::fillWindows( _rControlList );
m_aMySQLSettings->fillWindows( _rControlList); m_aMySQLSettings->fillWindows( _rControlList);
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pSeparator1)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pSeparator1));
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pSeparator2)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pSeparator2));
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pUserNameLabel)); _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pUserNameLabel));
} }
bool MySQLNativePage::FillItemSet( SfxItemSet* _rSet ) bool MySQLNativePage::FillItemSet( SfxItemSet* _rSet )
...@@ -769,13 +769,13 @@ namespace dbaui ...@@ -769,13 +769,13 @@ namespace dbaui
return VclPtr<OTextDetailsPage>::Create( pParent.pParent, *_rAttrSet ); return VclPtr<OTextDetailsPage>::Create( pParent.pParent, *_rAttrSet );
} }
void OTextDetailsPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) void OTextDetailsPage::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
OCommonBehaviourTabPage::fillControls(_rControlList); OCommonBehaviourTabPage::fillControls(_rControlList);
m_pTextConnectionHelper->fillControls(_rControlList); m_pTextConnectionHelper->fillControls(_rControlList);
} }
void OTextDetailsPage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) void OTextDetailsPage::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
OCommonBehaviourTabPage::fillWindows(_rControlList); OCommonBehaviourTabPage::fillWindows(_rControlList);
m_pTextConnectionHelper->fillWindows(_rControlList); m_pTextConnectionHelper->fillWindows(_rControlList);
......
dbaccess/source/ui/dlg/detailpages.hxx
Dosyayı görüntüle @ 9212fadc
...@@ -82,10 +82,10 @@ namespace dbaui ...@@ -82,10 +82,10 @@ namespace dbaui
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
// <method>OGenericAdministrationPage::fillControls</method> // <method>OGenericAdministrationPage::fillControls</method>
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
// <method>OGenericAdministrationPage::fillWindows</method> // <method>OGenericAdministrationPage::fillWindows</method>
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
private: private:
DECL_LINK(CharsetSelectHdl, ListBox&, void); DECL_LINK(CharsetSelectHdl, ListBox&, void);
}; };
...@@ -146,8 +146,8 @@ namespace dbaui ...@@ -146,8 +146,8 @@ namespace dbaui
virtual void dispose() override; virtual void dispose() override;
protected: protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
private: private:
VclPtr<FixedText> m_pFTHostname; VclPtr<FixedText> m_pFTHostname;
VclPtr<Edit> m_pEDHostname; VclPtr<Edit> m_pEDHostname;
...@@ -218,8 +218,8 @@ namespace dbaui ...@@ -218,8 +218,8 @@ namespace dbaui
protected: protected:
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
}; };
// OOdbcDetailsPage // OOdbcDetailsPage
...@@ -259,8 +259,8 @@ namespace dbaui ...@@ -259,8 +259,8 @@ namespace dbaui
virtual bool prepareLeave() override; virtual bool prepareLeave() override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
private: private:
}; };
......
dbaccess/source/ui/dlg/generalpage.cxx
Dosyayı görüntüle @ 9212fadc
...@@ -351,14 +351,14 @@ namespace dbaui ...@@ -351,14 +351,14 @@ namespace dbaui
m_aEmbeddedURLPrefixes[nPos] = _sType; m_aEmbeddedURLPrefixes[nPos] = _sType;
} }
void OGeneralPage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) void OGeneralPage::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
_rControlList.push_back( new ODisableWrapper<FixedText>( m_pSpecialMessage ) ); _rControlList.emplace_back( new ODisableWrapper<FixedText>( m_pSpecialMessage ) );
} }
void OGeneralPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) void OGeneralPage::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
_rControlList.push_back( new OSaveValueWrapper<ListBox>( m_pDatasourceType ) ); _rControlList.emplace_back( new OSaveValueWrapper<ListBox>( m_pDatasourceType ) );
} }
void OGeneralPage::implSetCurrentType( const OUString& _eType ) void OGeneralPage::implSetCurrentType( const OUString& _eType )
......
dbaccess/source/ui/dlg/generalpage.hxx
Dosyayı görüntüle @ 9212fadc
...@@ -80,9 +80,9 @@ namespace dbaui ...@@ -80,9 +80,9 @@ namespace dbaui
virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ); virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName );
// <method>OGenericAdministrationPage::fillControls</method> // <method>OGenericAdministrationPage::fillControls</method>
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
// <method>OGenericAdministrationPage::fillWindows</method> // <method>OGenericAdministrationPage::fillWindows</method>
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
void onTypeSelected(const OUString& _sURLPrefix); void onTypeSelected(const OUString& _sURLPrefix);
void initializeTypeList(); void initializeTypeList();
......
dbaccess/source/ui/dlg/tablespage.cxx
Dosyayı görüntüle @ 9212fadc
...@@ -558,13 +558,13 @@ namespace dbaui ...@@ -558,13 +558,13 @@ namespace dbaui
return true; return true;
} }
void OTableSubscriptionPage::fillControls(std::vector< ISaveValueWrapper* >& /*_rControlList*/) void OTableSubscriptionPage::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& /*_rControlList*/)
{ {
} }
void OTableSubscriptionPage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) void OTableSubscriptionPage::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{ {
_rControlList.push_back(new ODisableWrapper<VclContainer>(m_pTables)); _rControlList.emplace_back(new ODisableWrapper<VclContainer>(m_pTables));
} }
} // namespace dbaui } // namespace dbaui
......
dbaccess/source/ui/dlg/tablespage.hxx
Dosyayı görüntüle @ 9212fadc
...@@ -60,8 +60,8 @@ namespace dbaui ...@@ -60,8 +60,8 @@ namespace dbaui
virtual void dispose() override; virtual void dispose() override;
private: private:
virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
DECL_LINK( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); DECL_LINK( OnTreeEntryCompare, const SvSortData&, sal_Int32 );
DECL_LINK( OnTreeEntryChecked, void*, void ); DECL_LINK( OnTreeEntryChecked, void*, void );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment