Bug 1028565 - Part 3: Flatten editor/txtsvc/{public,src}/ directories. r=ehsan

--HG--
rename : editor/txtsvc/src/nsFilteredContentIterator.cpp => editor/txtsvc/nsFilteredContentIterator.cpp
rename : editor/txtsvc/src/nsFilteredContentIterator.h => editor/txtsvc/nsFilteredContentIterator.h
rename : editor/txtsvc/public/nsIInlineSpellChecker.idl => editor/txtsvc/nsIInlineSpellChecker.idl
rename : editor/txtsvc/public/nsISpellChecker.h => editor/txtsvc/nsISpellChecker.h
rename : editor/txtsvc/public/nsITextService.h => editor/txtsvc/nsITextService.h
rename : editor/txtsvc/public/nsITextServicesDocument.h => editor/txtsvc/nsITextServicesDocument.h
rename : editor/txtsvc/public/nsITextServicesFilter.idl => editor/txtsvc/nsITextServicesFilter.idl
rename : editor/txtsvc/src/nsTSAtomList.h => editor/txtsvc/nsTSAtomList.h
rename : editor/txtsvc/public/nsTextServicesCID.h => editor/txtsvc/nsTextServicesCID.h
rename : editor/txtsvc/src/nsTextServicesDocument.cpp => editor/txtsvc/nsTextServicesDocument.cpp
rename : editor/txtsvc/src/nsTextServicesDocument.h => editor/txtsvc/nsTextServicesDocument.h
rename : editor/txtsvc/src/nsTextServicesFactory.cpp => editor/txtsvc/nsTextServicesFactory.cpp

editor/txtsvc/moz.build

@@ -4,5 +4,25 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-PARALLEL_DIRS += ['public', 'src']
+XPIDL_SOURCES += [
+    'nsIInlineSpellChecker.idl',
+    'nsITextServicesFilter.idl',
+]
 
+XPIDL_MODULE = 'txtsvc'
+
+EXPORTS += [
+    'nsISpellChecker.h',
+    'nsITextService.h',
+    'nsITextServicesDocument.h',
+    'nsTextServicesCID.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsFilteredContentIterator.cpp',
+    'nsTextServicesDocument.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'gklayout'

editor/txtsvc/public/moz.build

@@ -1,20 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIInlineSpellChecker.idl',
-    'nsITextServicesFilter.idl',
-]
-
-XPIDL_MODULE = 'txtsvc'
-
-EXPORTS += [
-    'nsISpellChecker.h',
-    'nsITextService.h',
-    'nsITextServicesDocument.h',
-    'nsTextServicesCID.h',
-]
-

editor/txtsvc/src/moz.build

@@ -1,14 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-UNIFIED_SOURCES += [
-    'nsFilteredContentIterator.cpp',
-    'nsTextServicesDocument.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'gklayout'

layout/build/moz.build

@@ -71,7 +71,7 @@ LOCAL_INCLUDES += [
     '/editor/libeditor/html',
     '/editor/libeditor/text',
     '/editor/txmgr',
-    '/editor/txtsvc/src',
+    '/editor/txtsvc',
     '/extensions/cookie',
     '/js/xpconnect/loader',
     '/js/xpconnect/src',