Fix compilation errors from refactor

hyperair · Mar 19, 2011 · 3f81759 · 3f81759
1 parent 7cb040e
commit 3f81759
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/src/yatta/curl/chunk.cc b/src/yatta/curl/chunk.cc
@@ -22,7 +22,7 @@
 #include <sigc++/signal.h>
 
 #include "chunk.hh"
-#include "download.hh"
+#include "../download.hh"
 #include "manager.hh"
 
 namespace Yatta

diff --git a/src/yatta/curl/chunk.hh b/src/yatta/curl/chunk.hh
@@ -24,13 +24,12 @@
 #include <sigc++/slot.h>
 #include <sigc++/connection.h>
 
+#include "../download.hh"
+
 namespace Yatta
 {
     namespace Curl
     {
-        // forward declaration
-        class Download;
-
         class Chunk
         {
         public:
@@ -46,7 +45,7 @@ namespace Yatta
             typedef sigc::slot<void, CURLcode> slot_finished_t;
 
             // constructors and destructors
-            explicit Chunk (Download &parent, size_t offset, size_t total=0);
+            Chunk (Download &parent, size_t offset, size_t total=0);
             virtual  ~Chunk ();
 
             // member functions

diff --git a/src/yatta/download.cc b/src/yatta/download.cc
@@ -26,6 +26,7 @@
 #include "download.hh"
 #include "ioqueue.hh"
 #include "curl/manager.hh"
+#include "curl/chunk.hh"
 
 namespace Yatta
 {

diff --git a/src/yatta/download.hh b/src/yatta/download.hh
@@ -23,11 +23,10 @@
 #include <glibmm/ustring.h>
 #include <glibmm/refptr.h>
 
-#include "curl/chunk.hh"
-#include "curl/manager.hh"
-
 namespace Yatta
 {
+    namespace Curl { class Chunk; } // FIXME: abstract Chunk away so we don't
+    typedef Curl::Chunk Chunk;      // have to resort to this hack
     class Download : public sigc::trackable
     {
     public:

diff --git a/src/yatta/ioqueue.hh b/src/yatta/ioqueue.hh
@@ -24,13 +24,7 @@
 #include <sigc++/slot.h>
 #include <glibmm/refptr.h>
 
-// some forward decls
-namespace Gio
-{
-    class File;
-    class AsyncResult;
-    class Error;
-}
+#include <giomm.h>
 
 namespace Yatta
 {