[tracker/libtracker-miner] Include file clean ups and removed unused files
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/libtracker-miner] Include file clean ups and removed unused files
- Date: Tue, 4 Aug 2009 17:35:30 +0000 (UTC)
commit 18db710c98aa838c65b6ec0df27a8d02248913b7
Author: Martyn Russell <martyn imendio com>
Date: Tue Aug 4 18:00:54 2009 +0100
Include file clean ups and removed unused files
src/libtracker-miner/Makefile.am | 3 -
src/libtracker-miner/tracker-crawler.c | 10 -
src/libtracker-miner/tracker-crawler.h | 2 +-
src/libtracker-miner/tracker-dbus.h | 1 -
src/libtracker-miner/tracker-miner-crawler.c | 241 --------------------------
src/libtracker-miner/tracker-miner-crawler.h | 71 --------
src/libtracker-miner/tracker-miner-test.c | 4 +-
src/libtracker-miner/tracker-miner-test.h | 4 +-
src/libtracker-miner/tracker-miner.c | 2 +
src/libtracker-miner/tracker-monitor.c | 10 +-
src/libtracker-miner/tracker-monitor.h | 1 -
src/libtracker-miner/tracker-processor.c | 12 +--
src/libtracker-miner/tracker-processor.h | 2 -
13 files changed, 13 insertions(+), 350 deletions(-)
---
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index fc42315..e230214 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -21,9 +21,6 @@ libtracker_minerdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
libtracker_minerincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-miner/
libtracker_miner_LTLIBRARIES = libtracker-miner.la
-# tracker-miner-crawler.c
-# tracker-miner-crawler.h
-
libtracker_miner_la_SOURCES = \
tracker-crawler.c \
tracker-crawler.h \
diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c
index cb6e58c..e278c71 100644
--- a/src/libtracker-miner/tracker-crawler.c
+++ b/src/libtracker-miner/tracker-crawler.c
@@ -20,19 +20,9 @@
#include "config.h"
-#include <string.h>
-
#include <gio/gio.h>
-#include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-type-utils.h>
-#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-module-config.h>
-
#include "tracker-crawler.h"
-#include "tracker-dbus.h"
-#include "tracker-monitor.h"
#include "tracker-marshal.h"
#define TRACKER_CRAWLER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CRAWLER, TrackerCrawlerPrivate))
diff --git a/src/libtracker-miner/tracker-crawler.h b/src/libtracker-miner/tracker-crawler.h
index 6096988..6872c1c 100644
--- a/src/libtracker-miner/tracker-crawler.h
+++ b/src/libtracker-miner/tracker-crawler.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
#define TRACKER_IS_CRAWLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_CRAWLER))
#define TRACKER_CRAWLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_CRAWLER, TrackerCrawlerClass))
-typedef struct TrackerCrawler TrackerCrawler;
+typedef struct TrackerCrawler TrackerCrawler;
typedef struct TrackerCrawlerClass TrackerCrawlerClass;
typedef struct TrackerCrawlerPrivate TrackerCrawlerPrivate;
diff --git a/src/libtracker-miner/tracker-dbus.h b/src/libtracker-miner/tracker-dbus.h
index b1508d5..bed49ab 100644
--- a/src/libtracker-miner/tracker-dbus.h
+++ b/src/libtracker-miner/tracker-dbus.h
@@ -1,6 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia
*
* This library is free software; you can redistribute it and/or
diff --git a/src/libtracker-miner/tracker-miner-test.c b/src/libtracker-miner/tracker-miner-test.c
index bcc457a..18dca77 100644
--- a/src/libtracker-miner/tracker-miner-test.c
+++ b/src/libtracker-miner/tracker-miner-test.c
@@ -18,6 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include "tracker-miner-test.h"
G_DEFINE_TYPE (TrackerMinerTest, tracker_miner_test, TRACKER_TYPE_PROCESSOR)
@@ -25,13 +27,11 @@ G_DEFINE_TYPE (TrackerMinerTest, tracker_miner_test, TRACKER_TYPE_PROCESSOR)
static void
tracker_miner_test_class_init (TrackerMinerTestClass *klass)
{
-
}
static void
tracker_miner_test_init (TrackerMinerTest *miner)
{
-
}
TrackerMiner *
diff --git a/src/libtracker-miner/tracker-miner-test.h b/src/libtracker-miner/tracker-miner-test.h
index d000ef3..c623665 100644
--- a/src/libtracker-miner/tracker-miner-test.h
+++ b/src/libtracker-miner/tracker-miner-test.h
@@ -21,6 +21,8 @@
#ifndef __TRACKER_MINER_TEST_H__
#define __TRACKER_MINER_TEST_H__
+#include <glib-object.h>
+
#include <libtracker-miner/tracker-processor.h>
G_BEGIN_DECLS
@@ -44,7 +46,7 @@ struct TrackerMinerTestClass {
};
GType tracker_miner_test_get_type (void) G_GNUC_CONST;
-TrackerMiner * tracker_miner_test_new (const gchar *name);
+TrackerMiner * tracker_miner_test_new (const gchar *name);
G_END_DECLS
diff --git a/src/libtracker-miner/tracker-miner.c b/src/libtracker-miner/tracker-miner.c
index 9f893e7..915721b 100644
--- a/src/libtracker-miner/tracker-miner.c
+++ b/src/libtracker-miner/tracker-miner.c
@@ -18,6 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include <libtracker/tracker.h>
#include "tracker-miner.h"
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index 04d35b7..ab6741f 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -20,18 +20,16 @@
#include "config.h"
-#include <string.h>
#include <stdlib.h>
-
-#include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-module-config.h>
+#include <string.h>
#include <sys/inotify.h>
+
#include <libinotify/libinotify.h>
+#include <libtracker-common/tracker-module-config.h>
+
#include "tracker-monitor.h"
-#include "tracker-dbus.h"
#include "tracker-marshal.h"
#define TRACKER_MONITOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_MONITOR, TrackerMonitorPrivate))
diff --git a/src/libtracker-miner/tracker-monitor.h b/src/libtracker-miner/tracker-monitor.h
index 4132179..ed4d4af 100644
--- a/src/libtracker-miner/tracker-monitor.h
+++ b/src/libtracker-miner/tracker-monitor.h
@@ -1,6 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia
*
* This library is free software; you can redistribute it and/or
diff --git a/src/libtracker-miner/tracker-processor.c b/src/libtracker-miner/tracker-processor.c
index 1eac2d2..40657d2 100644
--- a/src/libtracker-miner/tracker-processor.c
+++ b/src/libtracker-miner/tracker-processor.c
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2009, Nokia
+ * Copyright (C) 2008, Nokia
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
@@ -20,18 +20,9 @@
#include "config.h"
-#include <string.h>
-
-#include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-storage.h>
#include <libtracker-common/tracker-module-config.h>
-#include <libtracker-common/tracker-utils.h>
-
-#include <libtracker-db/tracker-db-manager.h>
#include "tracker-crawler.h"
-#include "tracker-dbus.h"
#include "tracker-monitor.h"
#include "tracker-marshal.h"
#include "tracker-processor.h"
@@ -39,7 +30,6 @@
#define TRACKER_PROCESSOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_PROCESSOR, TrackerProcessorPrivate))
struct TrackerProcessorPrivate {
- TrackerStorage *hal;
TrackerMonitor *monitor;
TrackerCrawler *crawler;
diff --git a/src/libtracker-miner/tracker-processor.h b/src/libtracker-miner/tracker-processor.h
index db74367..358f474 100644
--- a/src/libtracker-miner/tracker-processor.h
+++ b/src/libtracker-miner/tracker-processor.h
@@ -24,8 +24,6 @@
#include <glib-object.h>
#include <gio/gio.h>
-#include <libtracker-common/tracker-storage.h>
-
#include "tracker-miner.h"
G_BEGIN_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]