| -rw-r--r-- | libopie/ofileselector.cc | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc index c3a3514..7451c1b 100644 --- a/libopie/ofileselector.cc +++ b/libopie/ofileselector.cc @@ -81,4 +81,4 @@ OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString { - - resize(wid->width(),wid->height()); + if(wid!=0) + resize(wid->width(),wid->height()); m_selector = selector; @@ -196,2 +196,3 @@ void OFileSelector::init() connect(m_select, SIGNAL(fileSelected( const DocLnk &) ), this, SLOT(slotFileBridgeSelected(const DocLnk &) ) ); + m_pseudoLayout = 0l; }else { @@ -597,3 +598,4 @@ void OFileSelector::slotViewCheck(const QString &view ){ delete m_pseudo; - delete m_pseudoLayout; + if(m_pseudoLayout!=0 ) + delete m_pseudoLayout; } @@ -626,16 +628,3 @@ void OFileSelector::slotViewCheck(const QString &view ){ - delete m_boxToolbar; - delete m_homeButton; - delete m_docButton; - delete m_location; - delete m_up; - delete m_pseudo; - delete m_pseudoLayout; - m_boxToolbar = 0; - m_homeButton = 0; - m_docButton = 0; - m_location = 0; - m_up = 0; - m_pseudo = 0; - m_pseudoLayout = 0; + @@ -652,16 +641,2 @@ void OFileSelector::slotViewCheck(const QString &view ){ m_View = 0; - delete m_boxToolbar; - delete m_homeButton; - delete m_docButton; - delete m_location; - delete m_up; - delete m_pseudo; - delete m_pseudoLayout; - m_boxToolbar = 0; - m_homeButton = 0; - m_docButton = 0; - m_location = 0; - m_up = 0; - m_pseudo = 0; - m_pseudoLayout = 0; @@ -703,3 +678,4 @@ void OFileSelector::initializeListView() delete m_pseudo; - delete m_pseudoLayout; + if(m_pseudoLayout!=0 ) // why did you overload malloc + delete m_pseudoLayout; m_boxToolbar = 0; |