[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kdevelop-devel
Subject:    Re: 5 patches and 3 new files...
From:       Yann Hodique <Yann.Hodique () lifl ! fr>
Date:       2002-09-24 21:06:12
[Download RAW message or body]

Oooops,
my fault, I should have checked them...
I don't know where it comes from, maybe some copy/paste from gideon diff output.
Here are the 3 guilty ones again. Or I'll commit them myself once I've got write \
access (thanks for that :-)

Best regards,
Yann.


["appwizard.diff" (application/octet-stream)]

Index: appwizarddlg.cpp
===================================================================
RCS file: /home/kde/kdevelop/parts/appwizard/appwizarddlg.cpp,v
retrieving revision 1.24
diff -u -r1.24 appwizarddlg.cpp
--- appwizarddlg.cpp	4 Aug 2002 16:58:25 -0000	1.24
+++ appwizarddlg.cpp	24 Sep 2002 20:44:06 -0000
@@ -412,6 +412,7 @@
             m_fileTemplates.append(fileTemplate);
         }
         licenseChanged(); // update template editors
+	textChanged(); // update Next button state
     } else {
         icon_label->clear();
         desc_textview->clear();
Index: appwizarddlgbase.ui
===================================================================
RCS file: /home/kde/kdevelop/parts/appwizard/appwizarddlgbase.ui,v
retrieving revision 1.6
diff -u -r1.6 appwizarddlgbase.ui
--- appwizarddlgbase.ui	4 Aug 2002 16:58:25 -0000	1.6
+++ appwizarddlgbase.ui	24 Sep 2002 20:44:06 -0000
@@ -370,6 +370,12 @@
         <receiver>AppWizardDlgBase</receiver>
         <slot>licenseChanged()</slot>
     </connection>
+    <connection>
+        <sender>email_edit</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>AppWizardDlgBase</receiver>
+        <slot>textChanged()</slot>
+    </connection>
 </connections>
 <tabstops>
     <tabstop>templates_listview</tabstop>
@@ -385,7 +391,7 @@
     <slot access="protected">destButtonClicked()</slot>
     <slot access="protected">projectLocationChanged()</slot>
     <slot access="protected">projectNameChanged()</slot>
-    <slot access="protected">templatesTreeViewClicked(QListViewItem*)</slot>
+    <slot access="protected">templatesTreeViewClicked( QListViewItem * )</slot>
     <slot access="protected">textChanged()</slot>
 </slots>
 <layoutdefaults spacing="6" margin="11"/>

["config.diff" (application/octet-stream)]

Index: Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/src/Makefile.am,v
retrieving revision 1.26
diff -u -3 -p -r1.26 Makefile.am
--- Makefile.am	5 Sep 2002 18:30:43 -0000	1.26
+++ Makefile.am	20 Sep 2002 08:25:14 -0000
@@ -12,7 +12,8 @@ gideon_SOURCES = main.cpp toplevel_mdi.c
 		 partselectwidget.cpp settingswidget.ui toplevel.cpp \
 		 toplevel_sdi.cpp statusbar.cpp editorproxy.cpp \
 		 debugger.cpp documentationpart.cpp splashscreen.cpp \
-		 projectworkspace.cpp
+		 projectworkspace.cpp \
+		 generalinfowidgetbase.ui generalinfowidget.cpp
 
 gideon_METASOURCES = AUTO
 gideon_LDFLAGS = $(all_libraries) $(KDE_RPATH) 
Index: projectmanager.cpp
===================================================================
RCS file: /home/kde/kdevelop/src/projectmanager.cpp,v
retrieving revision 1.24
diff -u -r1.24 projectmanager.cpp
--- projectmanager.cpp	23 Sep 2002 00:31:07 -0000	1.24
+++ projectmanager.cpp	24 Sep 2002 20:20:02 -0000
@@ -32,6 +32,7 @@
 #include "partcontroller.h"
 #include "classstore.h"
 #include "partselectwidget.h"
+#include "generalinfowidget.h"
 #include "projectworkspace.h"
 
 #include "projectmanager.h"
@@ -106,6 +107,10 @@
                   KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, \
TopLevel::getInstance()->main(),  "project options dialog");
 
+    QVBox *box = dlg.addVBoxPage(i18n("General"));
+    GeneralInfoWidget *g = new GeneralInfoWidget(*API::getInstance()->projectDom(), \
box, "general informations widget"); +    connect (&dlg, SIGNAL(okClicked()), g, \
SLOT(accept())); +  
   QVBox *vbox = dlg.addVBoxPage(i18n("Plugins"));
   PartSelectWidget *w = new PartSelectWidget(*API::getInstance()->projectDom(), \
vbox, "part selection widget");  connect( &dlg, SIGNAL(okClicked()), w, \
SLOT(accept()) );


["cpp.diff" (application/octet-stream)]

Index: Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/parts/cppsupport/Makefile.am,v
retrieving revision 1.27
diff -u -r1.27 Makefile.am
--- Makefile.am	19 Sep 2002 14:45:29 -0000	1.27
+++ Makefile.am	24 Sep 2002 20:10:34 -0000
@@ -44,7 +44,7 @@
 	mv tokenizer.cpp.tmp tokenizer.cpp
 
 tokenizer-cc.cpp: tokenizer.l
-	lfex -+ -otokenizer-cc.cpp $(srcdir)/tokenizer-cc.l && cat tokenizer-cc.cpp | \
+	flex -+ -otokenizer-cc.cpp $(srcdir)/tokenizer-cc.l && cat tokenizer-cc.cpp | \
 	sed -e "s,class istream;,#include <iostream\.h>," > tokenizer-cc.cpp.tmp && \
 	mv tokenizer-cc.cpp.tmp tokenizer-cc.cpp
 

_______________________________________________
Kdevelop-devel mailing list
Kdevelop-devel@barney.cs.uni-potsdam.de
http://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel

[prev in list] [next in list] [prev in thread] [next in thread]