Got rid of MOO_*_COMPILATION macros, they are useless

This commit is contained in:
Yevgen Muntyan 2013-04-22 01:02:44 -07:00
parent bda6730646
commit 869adcfe11
69 changed files with 4 additions and 151 deletions

View File

@ -38,7 +38,6 @@ source_files = \
../moo/mooedit/mooedithistoryitem.c\
../moo/mooedit/mooedithistoryitem.h\
../moo/mooedit/mooedit-impl.h\
../moo/mooedit/mooedit-misc.c\
../moo/mooedit/mooeditor.c\
../moo/mooedit/mooeditor.h\
../moo/mooedit/mooeditor-impl.h\

View File

@ -21,7 +21,6 @@
#include "config.h"
#endif
#define MOO_APP_COMPILATION
#define WANT_MOO_APP_CMD_CHARS
#include "mooapp-private.h"
#include "eggsmclient/eggsmclient.h"

View File

@ -17,7 +17,6 @@
#include "config.h"
#endif
#define MOOEDIT_COMPILATION
#include "mooedit/mooedit-private.h"
#include "mooedit/mooeditor-impl.h"
#include "mooedit/mooedit-fileops.h"
@ -1200,7 +1199,7 @@ try_convert_to_utf8_from_utf8 (const char *data,
{
const char *invalid;
gboolean valid_utf8;
// g_print ("try_convert_to_utf8_from_utf8()\n");
if (len >= BOM_UTF8_LEN && memcmp (data, BOM_UTF8, BOM_UTF8_LEN) == 0)
@ -1414,11 +1413,11 @@ moo_convert_file_data_to_utf8 (const char *data,
char *freeme = NULL;
char *result = NULL;
const char *bom_enc = NULL;
// g_print ("moo_convert_file_data_to_utf8(%s, %s)\n",
// encoding ? encoding : "<null>",
// cached_encoding ? cached_encoding : "<null>");
*used_enc = NULL;
if (!encoding && data_has_bom (data, len, &bom_enc))
@ -1466,7 +1465,7 @@ moo_convert_file_data_to_utf8 (const char *data,
return result;
}
static gboolean
static gboolean
encoding_is_utf8 (const char *encoding)
{
return !g_ascii_strcasecmp (encoding, "UTF-8") ||

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOOEDIT_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_EDIT_FILE_OPS_H
#define MOO_EDIT_FILE_OPS_H

View File

@ -1,3 +0,0 @@
#define MOOEDIT_COMPILATION
#include "mooedit-priv.h"

View File

@ -34,7 +34,6 @@
* @MOO_EDIT_STATUS_CLEAN: doesn't prompt on close, even if it's modified.
**/
#define MOOEDIT_COMPILATION
#include "mooedit/mooeditaction-factory.h"
#include "mooedit/mooedit-private.h"
#include "mooedit/mooeditview-impl.h"

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mooeditaction-factory.h"
#include "mooedit/mooeditaction.h"
#include "mooedit/mooedit-private.h"

View File

@ -17,7 +17,6 @@
* class:MooEditAction: (parent MooAction) (moo.private 1)
**/
#define MOOEDIT_COMPILATION
#include "mooedit/mooeditaction.h"
#include "mooedit/mooeditaction-factory.h"
#include "mooedit/mooeditfiltersettings.h"

View File

@ -17,7 +17,6 @@
* class:MooEditBookmark: (parent MooLineMark) (moo.private 1)
**/
#define MOOEDIT_COMPILATION
#include "mooedit/mooeditbookmark.h"
#include "mooedit/mooedit-private.h"
#include "mooedit/mootextbuffer.h"

View File

@ -13,8 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mooeditconfig.h"
#include "mooedit/moolang.h"
#include "mooedit/mooeditprefs.h"

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mooeditdialogs.h"
#include "mooedit/mooeditprefs.h"
#include "mooedit/mooedit-fileops.h"

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mooeditfiltersettings.h"
#include "mooedit/mooeditprefs.h"
#include "mooedit/mooeditaction.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOOEDIT_COMPILATION
#error "This file may not be used"
#endif
#ifndef MOO_EDIT_FILTER_SETTINGS_H
#define MOO_EDIT_FILTER_SETTINGS_H

View File

@ -1,10 +1,6 @@
#ifndef MOO_EDITOR_IMPL_H
#define MOO_EDITOR_IMPL_H
#ifndef MOOEDIT_COMPILATION
#error "This file may not be used directly"
#endif
#include "mooedit/mooeditor.h"
#include "mooutils/moohistorymgr.h"
#include "mooutils/moofilewatch.h"

View File

@ -1,4 +1,3 @@
#define MOOEDIT_COMPILATION
#include "mooedit/mooeditor-tests.h"
#include "mooedit/mooeditor-impl.h"
#include "mooutils/mooutils-fs.h"

View File

@ -17,7 +17,6 @@
* class:MooEditor: (parent GObject): editor object
**/
#define MOOEDIT_COMPILATION
#include "mooedit/mooeditor-private.h"
#include "mooedit/mooeditwindow-impl.h"
#include "mooedit/mooeditdialogs.h"

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mooeditprefs.h"
#include "mooedit/mooedit-impl.h"
#include "mooedit/mooeditview-impl.h"

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mooedit-impl.h"
#include "mooedit/mooeditor-impl.h"
#include "mooedit/mooeditprefs.h"

View File

@ -2,7 +2,6 @@
* class:MooEditView: (parent MooTextView) (moo.doc-object-name view): document view object
**/
#define MOOEDIT_COMPILATION
#include "mooedit/mooeditview-priv.h"
#include "mooedit/mooedit-impl.h"
#include "mooedit/mooeditwindow-impl.h"

View File

@ -21,7 +21,6 @@
#include "config.h"
#endif
#define MOOEDIT_COMPILATION
#include "mooedit/mooedit-impl.h"
#include "mooedit/mooeditdialogs.h"
#include "mooedit/mooeditwindow-impl.h"

View File

@ -14,7 +14,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mootext-private.h"
#include "marshals.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOOEDIT_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_FOLD_H
#define MOO_FOLD_H

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOOEDIT_COMPILATION
#error "This file may not be used"
#endif
#ifndef MOO_LANG_PRIVATE_H
#define MOO_LANG_PRIVATE_H

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOOEDIT_COMPILATION
#error "This file may not be used"
#endif
#ifndef MOO_LANG_MGR_PRIVATE_H
#define MOO_LANG_MGR_PRIVATE_H

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mootext-private.h"
#include "mooutils/mooutils-mem.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOOEDIT_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_LINE_BUFFER_H
#define MOO_LINE_BUFFER_H

View File

@ -18,7 +18,6 @@
* class:MooLineMark: (parent GObject) (constructable) (moo.private 1)
**/
#define MOOEDIT_COMPILATION
#include "mooedit/mootext-private.h"
#include "mooedit/mootextbuffer.h"
#include "marshals.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOOEDIT_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_TEXT_PRIVATE_H
#define MOO_TEXT_PRIVATE_H

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mootext-private.h"
#include "mooutils/mooutils-mem.h"

View File

@ -16,10 +16,6 @@
#ifndef MOO_TEXT_BTREE_H
#define MOO_TEXT_BTREE_H
#ifndef MOOEDIT_COMPILATION
#error "This file may not be included"
#endif
#include <glib.h>
G_BEGIN_DECLS

View File

@ -17,7 +17,6 @@
* class:MooTextBuffer: (parent GtkTextBuffer) (moo.private 1)
**/
#define MOOEDIT_COMPILATION
#include "mooedit/mootextiter.h"
#include "mooedit/mootext-private.h"
#include "mooedit/moolang-private.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOOEDIT_COMPILATION
#error "This file may not be used directly"
#endif
#ifndef MOO_TEXT_PRINT_PRIVATE_H
#define MOO_TEXT_PRINT_PRIVATE_H

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mootextprint-private.h"
#include "mooedit/mooedit.h"
#include "mooedit/mooedit-impl.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOOEDIT_COMPILATION
#error "This file may not be used directly"
#endif
#ifndef MOO_TEXT_PRINT_H
#define MOO_TEXT_PRINT_H

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mootextstylescheme.h"
#include "mooedit/mootextview.h"
#include "mooutils/mooi18n.h"

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "mooedit/mootextview-private.h"
#include "mooedit/mooeditview-impl.h"
#include "mooedit/mootextiter.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOOEDIT_COMPILATION
#error "Do not include this file"
#endif
#ifndef MOO_TEXT_VIEW_PRIVATE_H
#define MOO_TEXT_VIEW_PRIVATE_H

View File

@ -17,7 +17,6 @@
* class:MooTextView: (parent GtkTextView) (constructable): text view object
**/
#define MOOEDIT_COMPILATION
#include "mooedit/mooedit-accels.h"
#include "mooedit/mootextview-private.h"
#include "mooedit/mootextview.h"

View File

@ -17,7 +17,6 @@
#include "config.h"
#endif
#define MOO_FILE_VIEW_COMPILATION
#include "moofileview/moobookmarkmgr.h"
#include "moofileview/moofileentry.h"
#include "mooutils/mooprefs.h"

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOO_FILE_VIEW_COMPILATION
#include "moofileview/moobookmarkview.h"
#include "marshals.h"
#include <gtk/gtk.h>

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_BOOKMARK_VIEW_H
#define MOO_BOOKMARK_VIEW_H

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_FILE_PRIVATE_H
#define MOO_FILE_PRIVATE_H

View File

@ -21,7 +21,6 @@
#include "config.h"
#endif
#define MOO_FILE_VIEW_COMPILATION
#include "moofileview/moofilesystem.h"
#include "moofileview/moofile-private.h"
#include "mooutils/moofileicon.h"

View File

@ -15,7 +15,6 @@
/* XXX use MooCombo */
#define MOO_FILE_VIEW_COMPILATION
#include "moofileentry.h"
#include "moofilesystem.h"
#include "moofoldermodel.h"

View File

@ -15,7 +15,6 @@
#include <config.h>
#define MOO_FILE_VIEW_COMPILATION
#include "moofilesystem.h"
#include "moofolder-private.h"
#include "mooutils/mooutils-fs.h"

View File

@ -19,10 +19,6 @@
* from gtk/gtkfilesystem.h).
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_FILE_SYSTEM_H
#define MOO_FILE_SYSTEM_H

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#include "moofileview/moofile-private.h"
#include <string.h>
#include <glib.h>

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOO_FILE_VIEW_COMPILATION
#include "moofileview/moofileview-dialogs.h"
#include "moofileview/moofilesystem.h"
#include "moofileview/moofile-private.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_FILE_VIEW_DIALOGS_H
#define MOO_FILE_VIEW_DIALOGS_H

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#include <moofileview/moofileview-impl.h>
#include <gtk/gtk.h>

View File

@ -17,7 +17,6 @@
#include "config.h"
#endif
#define MOO_FILE_VIEW_COMPILATION
#include "moofileview/moofileview-tools.h"
#include "moofileview/moofileview-private.h"
#include "moofileview/moofile-private.h"

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOO_FILE_VIEW_COMPILATION
#include "moofileview/moofileview-accels.h"
#include "moofileview/moofileview-dialogs.h"
#include "moofileview/moobookmarkmgr.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_FOLDER_PRIVATE_H
#define MOO_FOLDER_PRIVATE_H

View File

@ -17,7 +17,6 @@
#include "config.h"
#endif
#define MOO_FILE_VIEW_COMPILATION
#include "moofileview/moofilesystem.h"
#include "moofileview/moofolder-private.h"
#include "mooutils/mooutils-fs.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_FOLDER_H
#define MOO_FOLDER_H

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_FOLDER_MODEL_PRIVATE_H
#define MOO_FOLDER_MODEL_PRIVATE_H

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOO_FILE_VIEW_COMPILATION
#include "moofoldermodel.h"
#include "moofile-private.h"
#include "moofolder-private.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_FOLDER_MODEL_H
#define MOO_FOLDER_MODEL_H

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOO_FILE_VIEW_COMPILATION
#include "mooiconview.h"
#include "marshals.h"
#include "mooutils/mooaccel.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_ICON_VIEW_H
#define MOO_ICON_VIEW_H

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOO_FILE_VIEW_COMPILATION
#include "moofileview/mootreeview.h"
#include "marshals.h"
#include "mooutils/mooutils-gobject.h"

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOO_FILE_VIEW_COMPILATION
#error "This file may not be included"
#endif
#ifndef MOO_TREE_VIEW_H
#define MOO_TREE_VIEW_H

View File

@ -13,10 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOOEDIT_COMPILATION
#error "This file may not be used"
#endif
#ifndef MOO_COMMAND_PRIVATE_H
#define MOO_COMMAND_PRIVATE_H

View File

@ -17,7 +17,6 @@
#include <config.h>
#endif
#define MOOEDIT_COMPILATION
#include "moocommand-private.h"
#include "moocommand-script.h"
#include "moocommand-exe.h"

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "moocommanddisplay.h"
#include "moocommand-private.h"
#include "mooutils/mooutils-misc.h"

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "moooutputfilterregex.h"
#include "moocommand.h"
#include "moocmdview.h"

View File

@ -13,7 +13,6 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/
#define MOOEDIT_COMPILATION
#include "moousertools.h"
#include "moousertools-prefs.h"
#include "moocommand-private.h"