Some updates

easy_bdb.h

@@ -36,7 +36,7 @@ struct Ord_Pair{
 T1 first;
 T2 second;
 	Ord_Pair() {};
-	Ord_Pair(T1 &t1,T2 &t2) { first=t1; second=t2; };
+	Ord_Pair(T1 t1,T2 t2) { first=t1; second=t2; };
 	bool operator<(Ord_Pair &s)
 	{
 		if(first<s.first)
@@ -290,6 +290,7 @@ public:
                 }
 		return data;
 	};
+	DS const &val() { return *this; };
 	bool end(){return data_exist=select(SELECT_END,data)==0;};
 	bool begin(){return data_exist=select(SELECT_START,data)==0;};
 	bool operator>(E const &k) { return data_exist=select(SELECT_GT,k,data)==0; };
@@ -326,7 +327,7 @@ public:
         };
         bool get(DS &data) {
                 if(data_exist)
-                        data=*this;
+                        data=this->data;
                 return data_exist;
         };
 	bool del() {

framework.kdevelop

@@ -9,8 +9,8 @@
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
-    <versioncontrol></versioncontrol>
+    <description/>
+    <versioncontrol/>
   </general>
   <kdevcustomproject>
     <run>
@@ -24,16 +24,16 @@
     </run>
     <build>
       <buildtool>make</buildtool>
-      <builddir></builddir>
+      <builddir/>
     </build>
     <make>
       <abortonerror>false</abortonerror>
       <numberofjobs>1</numberofjobs>
       <prio>0</prio>
       <dontact>false</dontact>
-      <makebin></makebin>
-      <defaulttarget></defaulttarget>
-      <makeoptions></makeoptions>
+      <makebin/>
+      <defaulttarget/>
+      <makeoptions/>
       <selectedenvironment>default</selectedenvironment>
       <environments>
         <default/>
@@ -42,12 +42,12 @@
   </kdevcustomproject>
   <kdevdebugger>
     <general>
-      <dbgshell></dbgshell>
-      <programargs></programargs>
-      <gdbpath></gdbpath>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <dbgshell/>
+      <programargs/>
+      <gdbpath/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
@@ -123,7 +123,7 @@
     <qt>
       <used>false</used>
       <version>3</version>
-      <root></root>
+      <root/>
     </qt>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -138,7 +138,7 @@
       <headerCompletionDelay>250</headerCompletionDelay>
     </codecompletion>
     <creategettersetter>
-      <prefixGet></prefixGet>
+      <prefixGet/>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>
@@ -149,9 +149,9 @@
   </kdevcppsupport>
   <kdevdocumentation>
     <projectdoc>
-      <docsystem></docsystem>
-      <docurl></docurl>
-      <usermanualurl></usermanualurl>
+      <docsystem/>
+      <docurl/>
+      <usermanualurl/>
     </projectdoc>
   </kdevdocumentation>
   <kdevfileview>
@@ -166,7 +166,7 @@
     </tree>
   </kdevfileview>
   <ctagspart>
-    <customArguments></customArguments>
-    <customTagfilePath></customTagfilePath>
+    <customArguments/>
+    <customTagfilePath/>
   </ctagspart>
 </kdevelop>

main_thread.cpp

@@ -9,7 +9,6 @@
 #include "text_tool.h"
 
 
-extern Templates_Set templates;
 
 void Main_Thread::init()
 {

templates.h

@@ -126,4 +126,8 @@ public:
 	int render(Text_Stream &out) { return render(out.text);};
 };
 
+extern Templates_Set templates;
+
+
+
 #endif /* _TEMPLATES_H */

templates/makefile

@@ -1,4 +1,4 @@
-
+PREFIX="T"
 INTERFACE=look
 
 
@@ -15,7 +15,7 @@ build: $(INTERFACE).template $(INTERFACE).h
 .SUFFIXES: .tmpl .op 
 
 $(INTERFACE).h: $(INTERFACE).def
-	cc_templ_d -i $< -h $@
+	cc_templ_d -p $(PREFIX) -i $< -h $@
 
 .tmpl.op: 
 	cc_templ_d -i $(INTERFACE).def $< -o $@

text_tool.cpp

@@ -80,12 +80,14 @@ void Text_Tool::getline(string &in)
 	input=L_TEXT;
 }
 
-void Text_Tool::text2html(string &s,string &content)
+void Text_Tool::text2html(char const *s,string &content)
 {
 	int i;
 	content="";
-	content.reserve(s.size()*3/2);
-	for(i=0;i<s.size();i++) {
+	if(s==NULL) return;
+	int len=strlen(s);
+	content.reserve(len*3/2);
+	for(i=0;i<len;i++) {
 		char c=s[i];
 		switch(c){
 			case '<': content+="&lt;"; break;
@@ -195,8 +197,10 @@ void Text_Tool::to_html(string s)
 	content+="\n";
 }
 
-void Text_Tool::markdown2html(string &in,string &out)
+void Text_Tool::markdown2html(char const *c_in,string &out)
 {
+#warning "Inefficient -- fix me"
+	string in=c_in;
 	init();
 	out="";
 	out.reserve(in.size()*3/2);
@@ -216,7 +220,7 @@ void Text_Tool::markdown2html(string &in,string &out)
 			break;
 		case CODE:
 			if(input!=L_CODE) {
-				out+="</code></pre>\n";
+				out+="</pre>\n";
 				state=NOTHING;
 			}
 			else {
@@ -285,7 +289,7 @@ void Text_Tool::markdown2html(string &in,string &out)
 				state=QUOTE;
 				break;
 			case L_CODE:
-				out+="<pre><code>\n";
+				out+="<pre>\n";
 				out+=content;
 				state=CODE;
 				break;

text_tool.h

@@ -19,8 +19,10 @@ class Text_Tool {
 	void to_html(string s);
 	void basic_to_html(string s);
 public:
-	void markdown2html(string &in,string &out);
-	void text2html(string &s,string &);
+	void markdown2html(char const *in,string &out);
+	void markdown2html(string &in,string &out) { markdown2html(in.c_str(),out);};
+	void text2html(char const *s,string &);
+	void text2html(string &s,string &out) {	text2html(s.c_str(),out);};
 };
 
 

textstream.h

@@ -30,6 +30,7 @@ public:
 	void puts(char const *t) { text += t; };
 	void putchar(char c) { text += c; };
 	char const *get() { return text.c_str(); };
+	string &getstring() { return text; };
 	int len() { return text.size(); };
 	void printf(char *format, ...);
 	void puts(string &str) { text += str; };