Rework architecture of NautilusWindow/NautilusWindowSlotInfo

In the past, nautilus was designed keeping in mind the concept that it
might not just be a file browser, but a sort of platform to embed
various kind of views in it.
  - libnautilus-private: general lowlevel items, such as the icon
    container, NautilusFile, I/O and so on
  - src: general widgets and UI items
  - src/file-manager: file manager views, agnostic of what's in src/,
    for the sake of being pluggable enough

This is really not applicable anymore, as nautilus won't go in any
direction other than being a file manager; at the same time, this
complicates code and architecture quite a lot.

In this commit, as a first step towards a more clean codebase, we remove
the NautilusWindowInfo and NautilusWindowSlotInfo interfaces, using
NautilusWindow and NautilusWindowSlot directly.

Note that there should be no actual code changes, only moving of pieces
around.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/nautilus-query-editor.h b/src/nautilus-query-editor.h
index de06b87ac..077e5059a 100644
--- a/src/nautilus-query-editor.h
+++ b/src/nautilus-query-editor.h
@@ -25,9 +25,10 @@
 #define NAUTILUS_QUERY_EDITOR_H
 
 #include <gtk/gtk.h>
+
 #include <libnautilus-private/nautilus-query.h>
-#include <libnautilus-private/nautilus-window-info.h>
-#include <nautilus-search-bar.h>
+
+#include "nautilus-search-bar.h"
 
 #define NAUTILUS_TYPE_QUERY_EDITOR nautilus_query_editor_get_type()
 #define NAUTILUS_QUERY_EDITOR(obj) \
@@ -57,6 +58,8 @@ typedef struct {
 	void (* cancel)   (NautilusQueryEditor *editor);
 } NautilusQueryEditorClass;
 
+#include "nautilus-window-slot.h"
+
 GType      nautilus_query_editor_get_type     	   (void);
 GtkWidget* nautilus_query_editor_new          	   (gboolean start_hidden,
 						    gboolean is_indexed);