# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279813401 -3600
# Node ID e3bafe42f98a7c954ad28a45eec3f49aeb7f9c69
# Parent  8b3b4d191198f3c25ef9bcd530b2e2dcad5f6d34# Parent  afe194b6b1cd42b66c3b6e4456559425d28390a9
Catchup to latest Symbian^4

diff -r afe194b6b1cd -r e3bafe42f98a qcpix/tsrc/samplesearch/main.cpp
--- a/qcpix/tsrc/samplesearch/main.cpp	Tue Jul 06 15:30:04 2010 +0300
+++ b/qcpix/tsrc/samplesearch/main.cpp	Thu Jul 22 16:43:21 2010 +0100
@@ -23,7 +23,7 @@
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-    SampleSearch w = SampleSearch();
+    SampleSearch w;
     w.show();
     int result =  a.exec();
     //delete w;
diff -r afe194b6b1cd -r e3bafe42f98a searchengine/util/cpixtools/inc/public/cpixstrtools.h
--- a/searchengine/util/cpixtools/inc/public/cpixstrtools.h	Tue Jul 06 15:30:04 2010 +0300
+++ b/searchengine/util/cpixtools/inc/public/cpixstrtools.h	Thu Jul 22 16:43:21 2010 +0100
@@ -447,7 +447,7 @@
                 throw ConversionExc("PANIC auto_array conversion constructor is used for non-char type %s",
                                     typeid(T).name());
 #else
-                compile_error(Template_type_T_is_not_a_character_type);
+                compile_error("Template_type_T_is_not_a_character_type");
 #endif
             }
         };