From 63f29b31eb6a8ea7a94dd2d2d56d5a5f544af9ae Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 9 Feb 2013 22:44:51 -0600 Subject: Fix unintended rename --- kdebugdialog/CMakeLists.txt | 2 +- kdebugdialog/Makefile.am | 2 +- kdebugdialog/kabstrackbugdialog.cpp | 85 ----------------------------------- kdebugdialog/kabstrackbugdialog.h | 54 ---------------------- kdebugdialog/kabstractdebugdialog.cpp | 85 +++++++++++++++++++++++++++++++++++ kdebugdialog/kabstractdebugdialog.h | 54 ++++++++++++++++++++++ kdebugdialog/kdebugdialog.h | 2 +- kdebugdialog/tdelistdebugdialog.h | 2 +- 8 files changed, 143 insertions(+), 143 deletions(-) delete mode 100644 kdebugdialog/kabstrackbugdialog.cpp delete mode 100644 kdebugdialog/kabstrackbugdialog.h create mode 100644 kdebugdialog/kabstractdebugdialog.cpp create mode 100644 kdebugdialog/kabstractdebugdialog.h diff --git a/kdebugdialog/CMakeLists.txt b/kdebugdialog/CMakeLists.txt index 915293164..f6eccd0fe 100644 --- a/kdebugdialog/CMakeLists.txt +++ b/kdebugdialog/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( tde_add_executable( kdebugdialog AUTOMOC SOURCES - main.cpp kabstrackbugdialog.cpp kdebugdialog.cpp + main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp tdelistdebugdialog.cpp LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} diff --git a/kdebugdialog/Makefile.am b/kdebugdialog/Makefile.am index 94e7d4b26..9d5a6e257 100644 --- a/kdebugdialog/Makefile.am +++ b/kdebugdialog/Makefile.am @@ -6,7 +6,7 @@ INCLUDES= $(all_includes) bin_PROGRAMS = kdebugdialog -kdebugdialog_SOURCES = main.cpp kabstrackbugdialog.cpp kdebugdialog.cpp tdelistdebugdialog.cpp +kdebugdialog_SOURCES = main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp tdelistdebugdialog.cpp kdebugdialog_METASOURCES = AUTO kdebugdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) kdebugdialog_LDADD = $(LIB_TDEUI) diff --git a/kdebugdialog/kabstrackbugdialog.cpp b/kdebugdialog/kabstrackbugdialog.cpp deleted file mode 100644 index 1047cc9b2..000000000 --- a/kdebugdialog/kabstrackbugdialog.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2000 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "kabstrackbugdialog.h" -#include -#include -#include -#include -#include -#include - -KAbstractDebugDialog::KAbstractDebugDialog( TQWidget *parent, const char *name, bool modal ) - : KDialog( parent, name, modal ) -{ - pConfig = new TDEConfig( "kdebugrc" ); -} - -KAbstractDebugDialog::~KAbstractDebugDialog() -{ - delete pConfig; -} - -void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout ) -{ - TQHBoxLayout *hbox = new TQHBoxLayout( KDialog::spacingHint() ); - topLayout->addLayout( hbox ); - pHelpButton = new KPushButton( KStdGuiItem::help(), this ); - hbox->addWidget( pHelpButton ); - hbox->addStretch(10); - TQSpacerItem *spacer = new TQSpacerItem(40, 0); - hbox->addItem(spacer); - pOKButton = new KPushButton( KStdGuiItem::ok(), this ); - hbox->addWidget( pOKButton ); - pApplyButton = new KPushButton( KStdGuiItem::apply(), this ); - hbox->addWidget( pApplyButton ); - pCancelButton = new KPushButton( KStdGuiItem::cancel(), this ); - hbox->addWidget( pCancelButton ); - - int w1 = pHelpButton->sizeHint().width(); - int w2 = pOKButton->sizeHint().width(); - int w3 = pCancelButton->sizeHint().width(); - int w4 = QMAX( w1, QMAX( w2, w3 ) ); - int w5 = pApplyButton->sizeHint().width(); - w4 = QMAX(w4, w5); - - pHelpButton->setFixedWidth( w4 ); - pOKButton->setFixedWidth( w4 ); - pApplyButton->setFixedWidth( w4 ); - pCancelButton->setFixedWidth( w4 ); - - connect( pHelpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowHelp() ) ); - connect( pOKButton, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) ); - connect( pApplyButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotApply() ) ); - connect( pCancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); -} - -void KAbstractDebugDialog::slotShowHelp() -{ - if (kapp) - kapp->invokeHelp(); -} - -void KAbstractDebugDialog::slotApply() -{ - save(); - pConfig->sync(); -} - -#include "kabstrackbugdialog.moc" diff --git a/kdebugdialog/kabstrackbugdialog.h b/kdebugdialog/kabstrackbugdialog.h deleted file mode 100644 index 6e3655973..000000000 --- a/kdebugdialog/kabstrackbugdialog.h +++ /dev/null @@ -1,54 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2000 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KABSTRACTDEBUGDIALOG__H -#define KABSTRACTDEBUGDIALOG__H - -#include - -class TDEConfig; -class TQVBoxLayout; -class KPushButton; - -class KAbstractDebugDialog : public KDialog -{ - Q_OBJECT -public: - KAbstractDebugDialog( TQWidget *parent=0, const char *name=0, bool modal=true ); - - virtual ~KAbstractDebugDialog(); - - virtual void buildButtons(TQVBoxLayout * topLayout); - - virtual void save() = 0; - TDEConfig * config() { return pConfig; } - -protected slots: - void slotShowHelp(); - void slotApply(); - -protected: - TDEConfig* pConfig; - KPushButton* pOKButton; - KPushButton* pCancelButton; - KPushButton* pHelpButton; - KPushButton* pApplyButton; -}; - -#endif diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/kdebugdialog/kabstractdebugdialog.cpp new file mode 100644 index 000000000..6901d8f68 --- /dev/null +++ b/kdebugdialog/kabstractdebugdialog.cpp @@ -0,0 +1,85 @@ +/* This file is part of the KDE libraries + Copyright (C) 2000 David Faure + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "kabstractdebugdialog.h" +#include +#include +#include +#include +#include +#include + +KAbstractDebugDialog::KAbstractDebugDialog( TQWidget *parent, const char *name, bool modal ) + : KDialog( parent, name, modal ) +{ + pConfig = new TDEConfig( "kdebugrc" ); +} + +KAbstractDebugDialog::~KAbstractDebugDialog() +{ + delete pConfig; +} + +void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout ) +{ + TQHBoxLayout *hbox = new TQHBoxLayout( KDialog::spacingHint() ); + topLayout->addLayout( hbox ); + pHelpButton = new KPushButton( KStdGuiItem::help(), this ); + hbox->addWidget( pHelpButton ); + hbox->addStretch(10); + TQSpacerItem *spacer = new TQSpacerItem(40, 0); + hbox->addItem(spacer); + pOKButton = new KPushButton( KStdGuiItem::ok(), this ); + hbox->addWidget( pOKButton ); + pApplyButton = new KPushButton( KStdGuiItem::apply(), this ); + hbox->addWidget( pApplyButton ); + pCancelButton = new KPushButton( KStdGuiItem::cancel(), this ); + hbox->addWidget( pCancelButton ); + + int w1 = pHelpButton->sizeHint().width(); + int w2 = pOKButton->sizeHint().width(); + int w3 = pCancelButton->sizeHint().width(); + int w4 = QMAX( w1, QMAX( w2, w3 ) ); + int w5 = pApplyButton->sizeHint().width(); + w4 = QMAX(w4, w5); + + pHelpButton->setFixedWidth( w4 ); + pOKButton->setFixedWidth( w4 ); + pApplyButton->setFixedWidth( w4 ); + pCancelButton->setFixedWidth( w4 ); + + connect( pHelpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowHelp() ) ); + connect( pOKButton, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) ); + connect( pApplyButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotApply() ) ); + connect( pCancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); +} + +void KAbstractDebugDialog::slotShowHelp() +{ + if (kapp) + kapp->invokeHelp(); +} + +void KAbstractDebugDialog::slotApply() +{ + save(); + pConfig->sync(); +} + +#include "kabstractdebugdialog.moc" diff --git a/kdebugdialog/kabstractdebugdialog.h b/kdebugdialog/kabstractdebugdialog.h new file mode 100644 index 000000000..6e3655973 --- /dev/null +++ b/kdebugdialog/kabstractdebugdialog.h @@ -0,0 +1,54 @@ +/* This file is part of the KDE libraries + Copyright (C) 2000 David Faure + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KABSTRACTDEBUGDIALOG__H +#define KABSTRACTDEBUGDIALOG__H + +#include + +class TDEConfig; +class TQVBoxLayout; +class KPushButton; + +class KAbstractDebugDialog : public KDialog +{ + Q_OBJECT +public: + KAbstractDebugDialog( TQWidget *parent=0, const char *name=0, bool modal=true ); + + virtual ~KAbstractDebugDialog(); + + virtual void buildButtons(TQVBoxLayout * topLayout); + + virtual void save() = 0; + TDEConfig * config() { return pConfig; } + +protected slots: + void slotShowHelp(); + void slotApply(); + +protected: + TDEConfig* pConfig; + KPushButton* pOKButton; + KPushButton* pCancelButton; + KPushButton* pHelpButton; + KPushButton* pApplyButton; +}; + +#endif diff --git a/kdebugdialog/kdebugdialog.h b/kdebugdialog/kdebugdialog.h index ab04a4ba8..eabe46429 100644 --- a/kdebugdialog/kdebugdialog.h +++ b/kdebugdialog/kdebugdialog.h @@ -19,7 +19,7 @@ #ifndef _KDEBUGDIALOG #define _KDEBUGDIALOG -#include "kabstrackbugdialog.h" +#include "kabstractdebugdialog.h" class TQLineEdit; class TQComboBox; diff --git a/kdebugdialog/tdelistdebugdialog.h b/kdebugdialog/tdelistdebugdialog.h index 2fc045891..07fa0bc91 100644 --- a/kdebugdialog/tdelistdebugdialog.h +++ b/kdebugdialog/tdelistdebugdialog.h @@ -20,7 +20,7 @@ #ifndef KLISTDEBUGDIALOG__H #define KLISTDEBUGDIALOG__H -#include "kabstrackbugdialog.h" +#include "kabstractdebugdialog.h" #include #include #include -- cgit v1.2.1