GNOME.org
 

glibmm r496 - in trunk: . examples gio gio/src tests tests/giomm_simple

Author: murrayc
Date: Thu Jan 10 11:57:26 2008
New Revision: 496
URL: http://svn.gnome.org/viewvc/glibmm?rev=496&view=rev

Log:
2008-01-10  Murray Cumming  <murrayc murrayc com>

* gio/giomm.h: Correct an include.
* gio/src/asyncresult.hg:
* gio/src/cancellable.hg:
* gio/src/drive.hg:
* gio/src/file.hg:
* gio/src/fileattribute.hg:
* gio/src/fileenumerator.hg:
* gio/src/fileicon.hg:
* gio/src/fileinfo.hg:
* gio/src/fileinputstream.hg:
* gio/src/fileoutputstream.hg:
* gio/src/outputstream.hg:
* gio/src/simpleasyncresult.hg:
* gio/src/volume.ccg:
* gio/src/volume.hg: Correct several includes to use giomm/ instead of 
glibmm/.

* configure.in:
* examples/Makefile.am_fragment:
* tests/Makefile.am_fragment: Include/Link giomm too.

* tests/Makefile.am:
* tests/giomm_simple/Makefile.am:
* tests/giomm_simple/giomm_simple.cc:
Added a little test, which shows that the library is not being built 
properly - we get undefined symbols.

Added:
   trunk/tests/giomm_simple/
      - copied from r495, /trunk/tests/glibmm_value/
   trunk/tests/giomm_simple/giomm_simple.cc
Removed:
   trunk/tests/giomm_simple/glibmm_value.cc
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/examples/Makefile.am_fragment
   trunk/gio/giomm.h
   trunk/gio/src/asyncresult.hg
   trunk/gio/src/cancellable.hg
   trunk/gio/src/drive.hg
   trunk/gio/src/file.hg
   trunk/gio/src/fileattribute.hg
   trunk/gio/src/fileenumerator.hg
   trunk/gio/src/fileicon.hg
   trunk/gio/src/fileinfo.hg
   trunk/gio/src/fileinputstream.hg
   trunk/gio/src/fileoutputstream.hg
   trunk/gio/src/outputstream.hg
   trunk/gio/src/simpleasyncresult.hg
   trunk/gio/src/volume.ccg
   trunk/gio/src/volume.hg
   trunk/tests/Makefile.am
   trunk/tests/Makefile.am_fragment
   trunk/tests/giomm_simple/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jan 10 11:57:26 2008
@@ -280,6 +280,7 @@
 AC_CONFIG_FILES([
   tests/Makefile
     tests/glibmm_value/Makefile
+    tests/giomm_simple/Makefile
 
   examples/Makefile
     examples/compose/Makefile

Modified: trunk/examples/Makefile.am_fragment
==============================================================================
--- trunk/examples/Makefile.am_fragment	(original)
+++ trunk/examples/Makefile.am_fragment	Thu Jan 10 11:57:26 2008
@@ -1,9 +1,11 @@
 
 local_glibmm_lib	= $(top_builddir)/glib/glibmm/libglibmm-2.4.la
+local_giomm_lib	= $(top_builddir)/gio/giomm/libgiomm-2.4.la
 
-LIBS  = $(local_glibmm_lib) $(GLIBMM_LIBS)
+LIBS  = $(local_glibmm_lib) $(local_giomm_lib) $(GLIBMM_LIBS)
 
-all_includes	= -I$(top_builddir)/glib	-I$(top_srcdir)/glib	\
+all_includes	= -I$(top_builddir)/glib -I$(top_srcdir)/glib	\
+		  -I$(top_builddir)/gio	-I$(top_srcdir)/gio	\
 		  $(GLIBMM_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS)
 
 DEFS			= @DEFS@

Modified: trunk/gio/giomm.h
==============================================================================
--- trunk/gio/giomm.h	(original)
+++ trunk/gio/giomm.h	Thu Jan 10 11:57:26 2008
@@ -29,7 +29,7 @@
 #include <giomm/fileinfo.h>
 #include <giomm/fileinputstream.h>
 #include <giomm/fileoutputstream.h>
-#include <giomm/icon>
+#include <giomm/icon.h>
 #include <giomm/init.h>
 #include <giomm/inputstream.h>
 #include <giomm/mountoperation.h>

Modified: trunk/gio/src/asyncresult.hg
==============================================================================
--- trunk/gio/src/asyncresult.hg	(original)
+++ trunk/gio/src/asyncresult.hg	Thu Jan 10 11:57:26 2008
@@ -17,7 +17,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gasyncresult.h>
+//#include <gio/gasyncresult.h> //We are not allowed to include individual headers.
+//TODO: Avoid this:
+#include <gio/gio.h>
 
 #include <glibmm/interface.h>
 #include <glibmm/object.h>

Modified: trunk/gio/src/cancellable.hg
==============================================================================
--- trunk/gio/src/cancellable.hg	(original)
+++ trunk/gio/src/cancellable.hg	Thu Jan 10 11:57:26 2008
@@ -17,6 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+//TODO: Avoid this:
 #include <gio/gio.h>
 
 #include <glibmm/object.h>

Modified: trunk/gio/src/drive.hg
==============================================================================
--- trunk/gio/src/drive.hg	(original)
+++ trunk/gio/src/drive.hg	Thu Jan 10 11:57:26 2008
@@ -20,10 +20,10 @@
 #include <gio/gio.h>
 
 #include <glibmm/interface.h>
-#include <glibmm/asyncresult.h>
-#include <glibmm/cancellable.h>
-#include <glibmm/icon.h>
-#include <glibmm/mountoperation.h>
+#include <giomm/asyncresult.h>
+#include <giomm/cancellable.h>
+#include <giomm/icon.h>
+#include <giomm/mountoperation.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)

Modified: trunk/gio/src/file.hg
==============================================================================
--- trunk/gio/src/file.hg	(original)
+++ trunk/gio/src/file.hg	Thu Jan 10 11:57:26 2008
@@ -21,14 +21,14 @@
 #include <string>
 #include <glibmm/error.h>
 #include <glibmm/interface.h>
-#include <glibmm/asyncresult.h>
-#include <glibmm/fileattribute.h>
-#include <glibmm/fileenumerator.h>
-#include <glibmm/fileinfo.h>
-#include <glibmm/fileinputstream.h>
-#include <glibmm/fileoutputstream.h>
-#include <glibmm/mountoperation.h>
-#include <glibmm/volume.h>
+#include <giomm/asyncresult.h>
+#include <giomm/fileattribute.h>
+#include <giomm/fileenumerator.h>
+#include <giomm/fileinfo.h>
+#include <giomm/fileinputstream.h>
+#include <giomm/fileoutputstream.h>
+#include <giomm/mountoperation.h>
+#include <giomm/volume.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)

Modified: trunk/gio/src/fileattribute.hg
==============================================================================
--- trunk/gio/src/fileattribute.hg	(original)
+++ trunk/gio/src/fileattribute.hg	Thu Jan 10 11:57:26 2008
@@ -76,7 +76,6 @@
  *
  * See http://library.gnome.org/devel/gio/unstable/gio-GFileAttribute.html for the list of default namespaces and the list of default keys.
  */
- */
 class FileAttributeInfoList
 {
   _CLASS_OPAQUE_REFCOUNTED(FileAttributeInfoList, GFileAttributeInfoList,

Modified: trunk/gio/src/fileenumerator.hg
==============================================================================
--- trunk/gio/src/fileenumerator.hg	(original)
+++ trunk/gio/src/fileenumerator.hg	Thu Jan 10 11:57:26 2008
@@ -22,9 +22,9 @@
 #include <glibmm/object.h>
 #include <glibmm/arrayhandle.h>
 #include <glibmm/listhandle.h>
-#include <glibmm/asyncresult.h>
-#include <glibmm/cancellable.h>
-#include <glibmm/fileinfo.h>
+#include <giomm/asyncresult.h>
+#include <giomm/cancellable.h>
+#include <giomm/fileinfo.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)

Modified: trunk/gio/src/fileicon.hg
==============================================================================
--- trunk/gio/src/fileicon.hg	(original)
+++ trunk/gio/src/fileicon.hg	Thu Jan 10 11:57:26 2008
@@ -20,9 +20,9 @@
 #include <gio/gio.h>
 
 #include <glibmm/object.h>
-#include <glibmm/file.h>
-#include <glibmm/icon.h>
-#include <glibmm/loadableicon.h>
+#include <giomm/file.h>
+#include <giomm/icon.h>
+#include <giomm/loadableicon.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)

Modified: trunk/gio/src/fileinfo.hg
==============================================================================
--- trunk/gio/src/fileinfo.hg	(original)
+++ trunk/gio/src/fileinfo.hg	Thu Jan 10 11:57:26 2008
@@ -22,8 +22,8 @@
 #include <glibmm/arrayhandle.h>
 #include <glibmm/object.h>
 #include <glibmm/timeval.h>
-#include <glibmm/fileattribute.h>
-#include <glibmm/icon.h>
+#include <giomm/fileattribute.h>
+#include <giomm/icon.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)

Modified: trunk/gio/src/fileinputstream.hg
==============================================================================
--- trunk/gio/src/fileinputstream.hg	(original)
+++ trunk/gio/src/fileinputstream.hg	Thu Jan 10 11:57:26 2008
@@ -21,11 +21,11 @@
 
 #include <glibmm/iochannel.h>
 #include <glibmm/object.h>
-#include <glibmm/fileinfo.h>
-#include <glibmm/inputstream.h>
+#include <giomm/fileinfo.h>
+#include <giomm/inputstream.h>
 
 _DEFS(giomm,gio)
-_PINCLUDE(glibmm/private/inputstream_p.h)
+_PINCLUDE(giomm/private/inputstream_p.h)
 
 namespace Gio
 {
@@ -85,9 +85,9 @@
    * @result true if the stream was successfully seeked to the position. false on error. 
    */
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  bool FileInputStream::seek(goffset offset, Glib::SeekType type)
+  bool seek(goffset offset, Glib::SeekType type);
   #else
-  bool FileInputStream::seek(goffset offset, Glib::SeekType type, std::auto_ptr<Glib::Error>& error)
+  bool seek(goffset offset, Glib::SeekType type, std::auto_ptr<Glib::Error>& error);
   #endif //GLIBMM_EXCEPTIONS_ENABLED
 };
 

Modified: trunk/gio/src/fileoutputstream.hg
==============================================================================
--- trunk/gio/src/fileoutputstream.hg	(original)
+++ trunk/gio/src/fileoutputstream.hg	Thu Jan 10 11:57:26 2008
@@ -20,12 +20,12 @@
 #include <gio/gio.h>
 
 #include <glibmm/object.h>
-#include <glibmm/fileinfo.h>
+#include <giomm/fileinfo.h>
 #include <glibmm/iochannel.h>
-#include <glibmm/outputstream.h>
+#include <giomm/outputstream.h>
 
 _DEFS(giomm,gio)
-_PINCLUDE(glibmm/private/outputstream_p.h)
+_PINCLUDE(giomm/private/outputstream_p.h)
 
 namespace Gio
 {
@@ -43,6 +43,7 @@
 
   _IGNORE(g_file_input_stream_query_info_async)
   void query_info_async(const std::string& attributes, int io_priority, Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+  //TODO: cancellable can probalby be NULL.
 
   _WRAP_METHOD(Glib::RefPtr<FileInfo> query_info_finish(Glib::RefPtr<AsyncResult>& result),
                g_file_output_stream_query_info_finish,
@@ -51,14 +52,18 @@
   _WRAP_METHOD(std::string get_etag() const, g_file_output_stream_get_etag)
   _WRAP_METHOD(goffset tell() const, g_file_output_stream_tell)
   _WRAP_METHOD(bool can_seek() const, g_file_output_stream_can_seek)
-  _WRAP_METHOD(bool seek(goffset offset, SeekType type, const Glib::RefPtr<Cancellable>& cancellable),
+
+  _WRAP_METHOD(bool seek(goffset offset, Glib::SeekType type, const Glib::RefPtr<Cancellable>& cancellable),
                g_file_output_stream_seek,
                errthrow)
+  //TODO: cancellable can probably be NULL.
 
   _WRAP_METHOD(bool can_truncate() const, g_file_output_stream_can_truncate)
   _WRAP_METHOD(bool truncate(goffset size, const Glib::RefPtr<Cancellable>& cancellable),
                g_file_output_stream_truncate,
                errthrow)
+  //TODO: cancellable can probalby be NULL.
+
 };
 
 } // namespace Gio

Modified: trunk/gio/src/outputstream.hg
==============================================================================
--- trunk/gio/src/outputstream.hg	(original)
+++ trunk/gio/src/outputstream.hg	Thu Jan 10 11:57:26 2008
@@ -20,9 +20,9 @@
 #include <gio/gio.h>
 
 #include <glibmm/object.h>
-#include <glibmm/asyncresult.h>
-#include <glibmm/cancellable.h>
-#include <glibmm/inputstream.h>
+#include <giomm/asyncresult.h>
+#include <giomm/cancellable.h>
+#include <giomm/inputstream.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)

Modified: trunk/gio/src/simpleasyncresult.hg
==============================================================================
--- trunk/gio/src/simpleasyncresult.hg	(original)
+++ trunk/gio/src/simpleasyncresult.hg	Thu Jan 10 11:57:26 2008
@@ -20,7 +20,7 @@
 #include <gio/gio.h>
 
 #include <glibmm/object.h>
-#include <glibmm/asyncresult.h>
+#include <giomm/asyncresult.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)

Modified: trunk/gio/src/volume.ccg
==============================================================================
--- trunk/gio/src/volume.ccg	(original)
+++ trunk/gio/src/volume.ccg	Thu Jan 10 11:57:26 2008
@@ -20,7 +20,7 @@
 #include <gio/gio.h>
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
-#include <glibmm/file.h>
+#include <giomm/file.h>
 
 namespace {
 

Modified: trunk/gio/src/volume.hg
==============================================================================
--- trunk/gio/src/volume.hg	(original)
+++ trunk/gio/src/volume.hg	Thu Jan 10 11:57:26 2008
@@ -20,11 +20,11 @@
 #include <gio/gio.h>
 
 #include <glibmm/interface.h>
-#include <glibmm/asyncresult.h>
-#include <glibmm/cancellable.h>
-#include <glibmm/drive.h>
-#include <glibmm/icon.h>
-#include <glibmm/mountoperation.h>
+#include <giomm/asyncresult.h>
+#include <giomm/cancellable.h>
+#include <giomm/drive.h>
+#include <giomm/icon.h>
+#include <giomm/mountoperation.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Thu Jan 10 11:57:26 2008
@@ -1,4 +1,5 @@
-test_dirs = glibmm_value
+test_dirs = glibmm_value 
+# giomm_simple
 
 SUBDIRS = $(test_dirs)
 EXTRA_DIST = Makefile.am_fragment

Modified: trunk/tests/Makefile.am_fragment
==============================================================================
--- trunk/tests/Makefile.am_fragment	(original)
+++ trunk/tests/Makefile.am_fragment	Thu Jan 10 11:57:26 2008
@@ -1,7 +1,9 @@
 INCLUDES = \
 	-I$(top_builddir)/glib	-I$(top_srcdir)/glib	\
+	-I$(top_builddir)/gio	-I$(top_srcdir)/gio	\
 	$(GLIBMM_CFLAGS) $(GTHREAD_CFLAGS)
 
 LIBS =	$(top_builddir)/glib/glibmm/libglibmm-2.4.la
+	$(top_builddir)/gio/giomm/libgiomm-2.4.la	
 	$(GLIBMM_LIBS)
 

Modified: trunk/tests/giomm_simple/Makefile.am
==============================================================================
--- /trunk/tests/glibmm_value/Makefile.am	(original)
+++ trunk/tests/giomm_simple/Makefile.am	Thu Jan 10 11:57:26 2008
@@ -1,7 +1,7 @@
 include $(top_srcdir)/tests/Makefile.am_fragment
 
 noinst_PROGRAMS = test
-test_SOURCES = main.cc glibmm_value.cc
+test_SOURCES = main.cc giomm_simple.cc
 
 
 

Added: trunk/tests/giomm_simple/giomm_simple.cc
==============================================================================
--- (empty file)
+++ trunk/tests/giomm_simple/giomm_simple.cc	Thu Jan 10 11:57:26 2008
@@ -0,0 +1,14 @@
+#include <giomm.h>
+#include <iostream>
+
+
+int main(int argc, char** argv)
+{
+  Glib::init();
+  Gio::init();
+   
+  Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/home/murrayc/test.txt");
+ 
+  return 0;
+}
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]