diff options
Diffstat (limited to 'languages/cpp/subclassingdlg.cpp')
| -rw-r--r-- | languages/cpp/subclassingdlg.cpp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 48bc3f91..3b583e09 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -31,7 +31,7 @@ #include <tqpushbutton.h> #include <domutil.h> #include <tqdom.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tqfile.h> @@ -191,13 +191,13 @@ void SubclassingDlg::readUiFile() // Special widget specific slots SlotItem *newSlot; - m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class",TQDIALOG_OBJECT_NAME_STRING); + m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog"); - if ( (m_qtBaseClassName==TQMAINWINDOW_OBJECT_NAME_STRING) || (m_qtBaseClassName==TQWIDGET_OBJECT_NAME_STRING) ) + if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") ) m_canBeModal = false; else m_canBeModal = true; - if (m_qtBaseClassName != TQWIDGET_OBJECT_NAME_STRING) + if (m_qtBaseClassName != "TQWidget") { newSlot = new SLOT_ACCEPT; newSlot->setOn(false); @@ -214,7 +214,7 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - if (m_qtBaseClassName == TQWIZARD_OBJECT_NAME_STRING) + if (m_qtBaseClassName == "TQWizard") { newSlot = new SLOT_NEXT; m_slotView->insertItem(newSlot); @@ -313,7 +313,7 @@ bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal) replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); if (canBeModal) { - replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); + replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = false"); replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); } @@ -369,10 +369,7 @@ void SubclassingDlg::accept() int qtVersion = DomUtil::readIntEntry( *m_cppSupport->project()->projectDom(), "/kdevcppsupport/qt/version", 3 ); if (m_creatingNewSubclass) { - if ( qtVersion == 3 ) - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.h")); - else - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_qt4_template.h")); + loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.h")); buffer = FileTemplate::read(m_cppSupport, "h") + buffer; TQFileInfo fi(m_filename + ".h"); @@ -464,10 +461,7 @@ void SubclassingDlg::accept() if (m_creatingNewSubclass) { - if ( qtVersion == 3 ) - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.cpp")); - else - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_qt4_template.cpp")); + loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.cpp")); buffer = FileTemplate::read(m_cppSupport, "cpp") + buffer; TQFileInfo fi(m_filename + ".cpp"); |