Update of /cvsroot/tora/tora In directory sc8-pr-cvs1:/tmp/cvs-serv24675 Modified Files: NEWS todebug.cpp toresultview.cpp tosearchreplace.cpp tosearchreplace.h tosyntaxsetup.cpp tosyntaxsetup.h totemplate.h totemplateprovider.cpp Log Message: Index: NEWS =================================================================== RCS file: /cvsroot/tora/tora/NEWS,v retrieving revision 1.844 retrieving revision 1.845 diff -C2 -d -r1.844 -r1.845 *** NEWS 26 May 2003 17:51:44 -0000 1.844 --- NEWS 4 Jun 2003 08:44:54 -0000 1.845 *************** *** 1,4 **** --- 1,7 ---- 1.3.10: + 2003-05-04: Fixed invisible menu in debugger. + 2003-06-02: Fixed some missing Q_OBJECT declarations. + 2003-05-28: Fixed bug with multiline list items. 2003-05-26: Remember if template window was open or not. 2003-05-26: Save values in extra columns of template SQL items. Index: todebug.cpp =================================================================== RCS file: /cvsroot/tora/tora/todebug.cpp,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** todebug.cpp 15 Feb 2003 23:27:04 -0000 1.101 --- todebug.cpp 4 Jun 2003 08:44:54 -0000 1.102 *************** *** 2366,2370 **** ToolMenu->insertItem(tr("Erase Runtime &Log"),this,SLOT(clearLog(void))); ! ToolMenu->insertItem(tr("&Debug"),ToolMenu,-1,toToolMenuIndex()); if (!isRunning()) { --- 2366,2370 ---- ToolMenu->insertItem(tr("Erase Runtime &Log"),this,SLOT(clearLog(void))); ! toMainWidget()->menuBar()->insertItem(tr("&Debug"),ToolMenu,-1,toToolMenuIndex()); if (!isRunning()) { Index: toresultview.cpp =================================================================== RCS file: /cvsroot/tora/tora/toresultview.cpp,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** toresultview.cpp 24 Apr 2003 15:02:53 -0000 1.122 --- toresultview.cpp 4 Jun 2003 08:44:55 -0000 1.123 *************** *** 92,96 **** if (text.isDouble()) toResultViewItem::setText(col,text); ! setText(col,(const QString &)text); } --- 92,96 ---- if (text.isDouble()) toResultViewItem::setText(col,text); ! setText(col,QString(text)); } *************** *** 300,304 **** if (text.isDouble()) toResultViewCheck::setText(col,text); ! setText(col,(const QString &)text); } --- 300,304 ---- if (text.isDouble()) toResultViewCheck::setText(col,text); ! setText(col,QString(text)); } Index: tosearchreplace.cpp =================================================================== RCS file: /cvsroot/tora/tora/tosearchreplace.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** tosearchreplace.cpp 17 Jul 2002 10:39:08 -0000 1.20 --- tosearchreplace.cpp 4 Jun 2003 08:44:55 -0000 1.21 *************** *** 47,50 **** --- 47,51 ---- #include <qregexp.h> + #include "tosearchreplace.moc" #include "tosearchreplaceui.moc" Index: tosearchreplace.h =================================================================== RCS file: /cvsroot/tora/tora/tosearchreplace.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tosearchreplace.h 9 Sep 2002 07:03:45 -0000 1.15 --- tosearchreplace.h 4 Jun 2003 08:44:55 -0000 1.16 *************** *** 45,48 **** --- 45,50 ---- class toSearchReplace : public toSearchReplaceUI, public toHelpContext, public toEditWidget::editHandler { + Q_OBJECT + toEditWidget *Target; public: Index: tosyntaxsetup.cpp =================================================================== RCS file: /cvsroot/tora/tora/tosyntaxsetup.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** tosyntaxsetup.cpp 17 Jul 2002 10:39:08 -0000 1.43 --- tosyntaxsetup.cpp 4 Jun 2003 08:44:55 -0000 1.44 *************** *** 56,59 **** --- 56,60 ---- #include <qlistview.h> + #include "tosyntaxsetup.moc" #include "tosyntaxsetupui.moc" Index: tosyntaxsetup.h =================================================================== RCS file: /cvsroot/tora/tora/tosyntaxsetup.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** tosyntaxsetup.h 17 Jul 2002 10:39:08 -0000 1.21 --- tosyntaxsetup.h 4 Jun 2003 08:44:55 -0000 1.22 *************** *** 46,49 **** --- 46,51 ---- class toSyntaxSetup : public toSyntaxSetupUI, public toSettingTab { + Q_OBJECT + QString List; QListBoxItem *Current; Index: totemplate.h =================================================================== RCS file: /cvsroot/tora/tora/totemplate.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** totemplate.h 26 May 2003 17:51:45 -0000 1.29 --- totemplate.h 4 Jun 2003 08:44:55 -0000 1.30 *************** *** 106,110 **** static std::list<toTemplateProvider *> *Providers; static bool Shown; ! static QCString ToolKey;; QCString Name; bool Open; --- 106,110 ---- static std::list<toTemplateProvider *> *Providers; static bool Shown; ! static QCString *ToolKey;; QCString Name; bool Open; *************** *** 151,156 **** /** Used internally to indicate tool key string */ ! static void setToolKey(const QCString &key) ! { ToolKey=key; } friend class toTemplate; --- 151,155 ---- /** Used internally to indicate tool key string */ ! static void setToolKey(const QCString &key); friend class toTemplate; Index: totemplateprovider.cpp =================================================================== RCS file: /cvsroot/tora/tora/totemplateprovider.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** totemplateprovider.cpp 26 May 2003 17:51:45 -0000 1.12 --- totemplateprovider.cpp 4 Jun 2003 08:44:55 -0000 1.13 *************** *** 39,43 **** std::list<toTemplateProvider *> *toTemplateProvider::Providers; bool toTemplateProvider::Shown=false; ! QCString toTemplateProvider::ToolKey; toTemplateProvider::toTemplateProvider(const QCString &name) --- 39,43 ---- std::list<toTemplateProvider *> *toTemplateProvider::Providers; bool toTemplateProvider::Shown=false; ! QCString *toTemplateProvider::ToolKey; toTemplateProvider::toTemplateProvider(const QCString &name) *************** *** 69,75 **** i++) (*i)->importData(data,prefix+":"+(*i)->name()); ! if(ToolKey.length()>0&&data[prefix+":Shown"]=="Yes") { try { ! toTool *tool=toTool::tool(ToolKey); if (tool) tool->createWindow(); --- 69,75 ---- i++) (*i)->importData(data,prefix+":"+(*i)->name()); ! if(ToolKey!=NULL&&data[prefix+":Shown"]=="Yes") { try { ! toTool *tool=toTool::tool(*ToolKey); if (tool) tool->createWindow(); *************** *** 91,92 **** --- 91,100 ---- Shown=shown; } + + void toTemplateProvider::setToolKey(const QCString &key) + { + if (!ToolKey) + ToolKey=new QCString; + + (*ToolKey)=key; + } |