# # # patch "COPYING" # from [0b184ad51ba2a79e85d2288d5fcf8a1ea0481ea4] # to [8624bcdae55baeef00cd11d5dfcfa60f68710a02] # # patch "README" # from [a0d51c7091e46ebc2f710f2378a2ff9a0a3fe74e] # to [0f12d254a4714783608dc81b5e4c6084136dc2c8] # # patch "src/Guitone.cpp" # from [b62776a0951ebab724cf59adb3130f80e291f0fc] # to [fe9bdfadb6f31a3ac4a79144bd3196b23d159a99] # # patch "src/Guitone.h" # from [58b322d7d904b8d40ac3199c369d2f26e9e8caa1] # to [0019cd72ab359d06301a1d5e8321c3f284351a4c] # # patch "src/main.cpp" # from [60049867487708f7eb18c012c34641041114aec8] # to [54663c130ac11f434a0cef52cfe02616894b0176] # # patch "src/model/Ancestors.cpp" # from [29675a51f35055b31a8692143e8e821bb8e47420] # to [40b168cdabbc4fbab891933ff9bd174bc434e4c6] # # patch "src/model/Ancestors.h" # from [a6b0213eed2a40a255465157f84d91c1d61224a4] # to [ae731fc84d04770fda2c286a3f717d9c2f2759ba] # # patch "src/model/AutomateCommand.cpp" # from [cb33a7922177d9b07d46bc81ecc1453f92c96c8e] # to [e98dedabd7391e9921f015cea8f272d2c48e719e] # # patch "src/model/AutomateCommand.h" # from [c8c94874519a7d87fc7dc9ea2264485f0e7f5ba0] # to [d0ad218af3a52074a5b41fc6590804f2a96b6a0e] # # patch "src/model/Branches.cpp" # from [ea39d230ea1aea5c8a629242985901757c9ecb4b] # to [d0a1ee6db5af0f1a7cdf864d070868a6d87d4532] # # patch "src/model/Branches.h" # from [fccb87b89b30e4fc485b56b24b17d45865750846] # to [8edacdc16749a3a6728efc6de407fed41708242a] # # patch "src/model/Certs.cpp" # from [147bef5808860b7085a17ee44b949ed87e72b6bc] # to [7d7c566ba3e4796e8b65d558fbb9bdb068bda5a9] # # patch "src/model/Certs.h" # from [c7be6e51d96a5b160aa89fe5984a753aab7e3d3d] # to [3aae2258184a7ea076935b471ebee44baf7bf1f5] # # patch "src/model/ChangesetModel.cpp" # from [dac0c2a9b597ffd6fcae4ef11be1cdb5767bfbb8] # to [d2d1f6b94d41e49a6d8127dc110bf02261e54a7d] # # patch "src/model/ChangesetModel.h" # from [9ce3de2a7bb54b90e2b303e957a2f6adcbd13c11] # to [96d199343b00c0f9cca4d49246392ff6cbfcab1a] # # patch "src/model/ContentDiff.cpp" # from [fb04d00840d5162745dcfa5717211b578ee03bb2] # to [ff1f36cc79508208262bac9b577edfa4bdb8bad0] # # patch "src/model/ContentDiff.h" # from [05f150811f860b606483142aca7c3597b367a7c8] # to [e89ba83d45953a4cfc745a4c7ad475e9733c37ff] # # patch "src/model/GetAttributes.cpp" # from [f270dea5c62bba8010b641fc5e2868d4d3db412f] # to [ed421d842b53dc2400e2c1adaae282c53e34c250] # # patch "src/model/GetAttributes.h" # from [5a6dd679c9422d351eb257d1112b92c66af8ad8f] # to [f34a9cc218e83e5dfeed11b7c9929e8b49c2a9cc] # # patch "src/model/GetBranchLog.cpp" # from [efea9b6fa86857e3563d2ebc15a6dda069ddae6a] # to [dffad69f432f8b3092213ef263bac4a9a1f524d6] # # patch "src/model/GetBranchLog.h" # from [b5bba049dabe1b6de146eaf5ba81ae26928240a0] # to [fd90592e93fa215361bfd6e9f9c7574c138a2fd6] # # patch "src/model/GetContentChanged.cpp" # from [ce555349e11ada4c5e5212099806c1a62741f2fc] # to [722cb14ca2adcc68a73ce4407f8b47caf0dd1cb8] # # patch "src/model/GetContentChanged.h" # from [a9265c18e8ec3639c6aa5248da12bbd0350b844d] # to [f906c204fe129f2b10e00f9514efeaff8750ded3] # # patch "src/model/GetFile.cpp" # from [1bf34182253597a267fbdbb3df6d8310307f2ca0] # to [c7c56add3d7c44df2b73a16c1884f5b73d232aba] # # patch "src/model/GetFile.h" # from [017efe23e86731dbbfc7dabb40fccefe3d3632c9] # to [7a964370cd74cd5aa333751d9966fb72c1fc44c1] # # patch "src/model/GetFileProxyModel.cpp" # from [8b19a1596259f8400fb4d857bd6599ecf0163a61] # to [003468ec344631ba5d09f39a052e463c20c0f9d8] # # patch "src/model/GetFileProxyModel.h" # from [adc53b614cef541e150d407316cb8d3b1bd58afc] # to [06ba895049c8f73ddca295f765966924661b9563] # # patch "src/model/GetRevision.cpp" # from [10be062fbe81f5de0a67a8326cda76b950d7e003] # to [f9f9f77f0cdd62b2fbe5d06e896db8c954d2b197] # # patch "src/model/GetRevision.h" # from [7426be701691a6da5c1ea9a27956db2dca40d326] # to [d6d94d54c3a9227e7df4d9603143419944a24691] # # patch "src/model/Inventory.cpp" # from [57255fca3e26efb58b0e5b8cc6435a130ad9bb17] # to [bf6c3eaa94c9b466b27b46d6071235981556b94b] # # patch "src/model/Inventory.h" # from [255f1d2dbb9f60515e659894c43ef81ab528a04a] # to [c45f6b4c627eae8b928f76d14c5e5cdd56c1e4ba] # # patch "src/model/InventoryItem.cpp" # from [da1dbcf421b48be5faff31386c36328b1190092b] # to [f37721d4b5f0b5656e7969d381ebf003a9d120ac] # # patch "src/model/InventoryItem.h" # from [2f8c89970fb09c802554de1646fba71c0b1b5748] # to [938dd7727633951c9ac80d40d358310db7708b19] # # patch "src/model/InventoryProxyModel.cpp" # from [389f45374d65a9cdfb920f89dd3277d1184d17a4] # to [ab51a52e28547434aa55ad4135fc535eaa513363] # # patch "src/model/InventoryProxyModel.h" # from [a7239616d0752740a3dfc9bd65d6d31ad2fe1973] # to [feb55b88ad3148ca79c6b03117b77c3d251bed57] # # patch "src/model/Keys.cpp" # from [3ccd0eae5ac689784457e9d8edaac8f3ae667da3] # to [19dfda529004934172d6ceb4511eae24e30af3f6] # # patch "src/model/Keys.h" # from [f5bcda560a03b830c14c8f8c369b4a96f695704d] # to [ebd6f123cf516f8d150820ec8b89c10038cb3cd2] # # patch "src/model/Manifest.cpp" # from [dccb314934d5ea95631976a992ebe532c57c39f1] # to [235f3ddeb0e0514934b9df6f619e87ceb9d6f387] # # patch "src/model/Manifest.h" # from [e482dcbaf3c30bd2a61773af588c7e6ff681df96] # to [40134a38a50a1e1fca501963c82b6aa822477bd3] # # patch "src/model/Select.cpp" # from [d1b4aa62ba14950f1c8dbc53caa5ad6041d0cdfc] # to [ca967f456759195df4c53ec6922c0a8967273c35] # # patch "src/model/Select.h" # from [5a925619f7bacf030b7522d9e9e2edcb6b94bcd7] # to [520e6de98e71ac10e9e72ac5341f725302096816] # # patch "src/model/Tags.cpp" # from [e5798cb9a2ce40be834b5066b014d23ce4ed267a] # to [80d62375cd40c37849eacf93a0bcb61d3983175b] # # patch "src/model/Tags.h" # from [f2e018cc8573864ec37d59bccae044789ba8f7cc] # to [f2fba601247219ecee7aae5c7ddff42aacfb872f] # # patch "src/model/Toposort.cpp" # from [9fec281ab3ffd60c7a7eb2f01cd07cdb1734a88e] # to [0100c237385ea177420b36a3daa5d7642ea49f89] # # patch "src/model/Toposort.h" # from [30f5a31bfba3f1af1d5eade39b7f04790ff54335] # to [85ef196576a29c5d66202858fbe131e4a53e9332] # # patch "src/monotone/FileExporter.cpp" # from [d66aabfa3ab17e27a8464b4721ff0d47f2a5cf56] # to [dc29c89ec8f7ac23b25811a34d88b442855890a9] # # patch "src/monotone/FileExporter.h" # from [c563d3d55236f6f05c5301b9e27e15e63e34e60a] # to [44a4bb7eb2d4f29f3c958bd41ecaa7588a5993a3] # # patch "src/monotone/MonotoneManager.cpp" # from [cb2c38e6c54d4a1c7cdb5936ee6fd7b4d929e4d6] # to [b4c54e815d640974832786998cc69e5e3a54dd56] # # patch "src/monotone/MonotoneManager.h" # from [ca14810692315d4a9d58d2c220ecbd00a2e69e20] # to [84e8236e6576ec4b8a1c2437299b32c7089265c5] # # patch "src/monotone/MonotoneThread.cpp" # from [cc51913105c329f227b953d1cca58ed349d2ed8a] # to [3696f27d199a112883ddd7a9f0262ae760c2107c] # # patch "src/monotone/MonotoneThread.h" # from [031a0d05e8b118a3fccc468c8b90b959ed89d0d2] # to [d4c4f289165b23192b2320242e7b89c874614f64] # # patch "src/monotone/MonotoneUtil.cpp" # from [337414f278e2f74e22c73a134de0e40d475a7af9] # to [7f47e03698a62113c610433e79677e8fcad36c67] # # patch "src/monotone/MonotoneUtil.h" # from [8577a38758622b8248682a538b53388640cf382a] # to [7173990600fd78e4e75a5bc0111d2c29e2a06ed7] # # patch "src/monotone/WorkspaceCommitter.cpp" # from [fec464ea30accdfdf993c11c1479f4b5303288a6] # to [8ef7bebbbcdc720ff1aa53ac9090cd3362488620] # # patch "src/monotone/WorkspaceCommitter.h" # from [19ad4daf22ac0416f00057e20524086a4d95b0a7] # to [e868a69ebf244aa67a0d02ef7a9372e798754fd8] # # patch "src/monotone/WorkspaceCreator.cpp" # from [7d51f6200bed2e9b2dba2117af5e9fe02e176867] # to [9bcaa2976315b76053c4161f56b4dede0cf8d8d3] # # patch "src/monotone/WorkspaceCreator.h" # from [f30353cccd83fcb6eb845ea9d9f86531daf9cc68] # to [083cbaffb7e152b00c45b8c4fc07aa86e3ebdaea] # # patch "src/util/AbstractParser.cpp" # from [07d457cc3931cd2f4f384b8313f50555f2048692] # to [9ad88bd1dd7dee2fce1360f5a21dac9bd6164287] # # patch "src/util/AbstractParser.h" # from [5d83ade859fbf057e5326f2bdcf8b0f6560a5be2] # to [71c0f2ebbfd02e654b2f32dec72b698d39d68441] # # patch "src/util/BasicIOParser.cpp" # from [f11c59b9074eee097cb97feea7f93bdd146ccb0d] # to [92345de7cfa61c17763d9f0089612714d4a3fdcf] # # patch "src/util/BasicIOParser.h" # from [b96df0f29dd64ac740c6e8a7f34c080406d3837e] # to [3028f25ad04d938ea6dfc4588f49f96aa3923382] # # patch "src/util/BasicIOWriter.cpp" # from [7965db7212e1d26f78c7923a3c8add0fd8dd46b7] # to [b024367720fc5840135057e261e7d6cdd380ffa1] # # patch "src/util/BasicIOWriter.h" # from [052ca233a44fa5c872b699b5eee4fd4cc6187f1b] # to [ac6d388027ae3cc382f957275561a643e32ff6de] # # patch "src/util/DebugLog.cpp" # from [513339e2eb09994edeed4ad8ed3d98b9a6101c81] # to [7b0350e236c93cd7e080e3bb6cf52aff7da94808] # # patch "src/util/DebugLog.h" # from [94f2cac41d2381a8ab113dc5adb29131844beaf4] # to [dc63b4ee3fb60f00c62c32e7c4634e75bc6eae98] # # patch "src/util/DiffParser.cpp" # from [32f4fa2ef30289c8834b08a70bfb69ab242b6e04] # to [67f905dd877d8cf230fde2b56f38395e55492743] # # patch "src/util/DiffParser.h" # from [e8f97b0c38907a7742f69ec562e738df29d0b5e5] # to [c8b6c48904a0c047a04dcd98a924611760ed64de] # # patch "src/util/IconProvider.cpp" # from [01301a1df50a721db13507ee5ded6d953a849dd7] # to [723f264a970d108792822b333278b521d2abcb61] # # patch "src/util/IconProvider.h" # from [28d9295d56473b98521a31e71a60d6afb1bb8697] # to [6073f11bce3d1c9679935a7b463ebecd5dfe7dc9] # # patch "src/util/Platform.cpp" # from [74b04910e5146544a2694650ae32ec490e1115c0] # to [be69d819cd16b15140aea1252a77ec212267f0c3] # # patch "src/util/Platform.h" # from [992ab64a32420a430ace5f8597ab78ca7979d859] # to [2c5278c532dfa37b2f0f2b6145704b3a536d307b] # # patch "src/util/Settings.cpp" # from [1101bd4a627996f8fe9f6ce52eb82a1f37e81c63] # to [6256bdd52ba6a391bd31ad0b1bd74e7a5e1dde0c] # # patch "src/util/Settings.h" # from [1fd9fd774712efeb13b3d3916f314d35071dc6a0] # to [c270582aa028c7a903405c024cabd2e6ed0cb965] # # patch "src/util/SignalWaiter.cpp" # from [d9179faf3f72dc87e7de72d6806b1d9618cc1cda] # to [e3b857d7058788806704e69d160efd2563e8bf80] # # patch "src/util/SignalWaiter.h" # from [ae0b9b4faf37d59c592b57d9c41b54c629532e26] # to [24eee3021bd2745af443823b08063f65548d8f5b] # # patch "src/util/StdioParser.cpp" # from [8717de07c9d5404df76f6e789edda3f5b17d4824] # to [ffbfb4a6dfb2870877d0161a8ec54bc8cce365a4] # # patch "src/util/StdioParser.h" # from [ed0742f484843b709c946a2c030cca934432335d] # to [2b4e6866c2b7d81e144ed1fad148e44060152b83] # # patch "src/util/TreeBuilder.cpp" # from [974da1b2402a50df3b002069411b67b0915f870b] # to [f06e614c4227c5a31bd6df57799cfcbf9ac77c09] # # patch "src/util/TreeBuilder.h" # from [a4acd39e265420a666b119b38d2f32b926ab85a9] # to [d195b4bba70b39269efdf3e30314667df1236db3] # # patch "src/view/AttributesView.cpp" # from [1a9ca66bb8fcee26e941b962d4f3d9efe975b417] # to [16d96b10bf5eccb0648dc457294b0d4866494154] # # patch "src/view/AttributesView.h" # from [a597ffe195bc7ac5bf32eb627f3c8c9262f3ab84] # to [6b308b6fc8efef73c592ee0a4f23c2a011c5e6b1] # # patch "src/view/DatabaseMenuBar.cpp" # from [6236815c5b8c7646cea7b748507155e2a13adeef] # to [eb1cb0434b4cb5e2538fbc2b955f4dbf1d57a167] # # patch "src/view/DatabaseMenuBar.h" # from [f435f33761943e4613197a3a842631761455b821] # to [c1c37db07324335a585574efaec0d73a8d8608f7] # # patch "src/view/DatabaseWindow.cpp" # from [301858460154bc94a7d4b433f40f2654716299bd] # to [355bc712383817ec469988c32e8161a8ea6ef1db] # # patch "src/view/DatabaseWindow.h" # from [fcbed5e70a24525711b45b6f840dde9c9fa94527] # to [4ba5d2d0af75f7731e952719f726d9cf7c5258ad] # # patch "src/view/DiffStatusView.cpp" # from [220dc080d58073f2c4265f0ee80e51cc11bc4178] # to [47387935d22581b12a4f8aa72f801a84f11c594d] # # patch "src/view/DiffStatusView.h" # from [fe66722b8b8fdf7076471e7e14c1c5d135aa4ada] # to [21d7658010a88b6b5e67f0603e7844e83937f0fc] # # patch "src/view/InventoryView.cpp" # from [8104c73eb4fd60d9b8eb5363109b7abdc1953f83] # to [d66ba062f6aa10dcc2902bfb3cc938677085b884] # # patch "src/view/InventoryView.h" # from [de7bdd693c187a8611d3af9b80ae05fdd56f6e40] # to [dd276275934c9f0737d6076a745656efa9e1a9e3] # # patch "src/view/InventoryViewDelegate.cpp" # from [85121a85ccab754b400fc5a33be1c007ba243f02] # to [7f98ffbb697062e56bd3dc304129aa698d87b58b] # # patch "src/view/InventoryViewDelegate.h" # from [7b67edf5a5cfa2460c972592b1dccbfb08777329] # to [bb14c373a2f671e55237ed612fb01cdf80591111] # # patch "src/view/MainWindow.cpp" # from [9234140581c324011828a21086196827bbda2605] # to [97f3476a31a453cffbe0ad2d28252ab797547b99] # # patch "src/view/MainWindow.h" # from [aec45dc484db45f56d74532941abe658e385d6f5] # to [9a06be9e8a5b42f070623f2be8e753e36d9d4190] # # patch "src/view/MenuBar.cpp" # from [bc48b2de266b56168282dc8b262630393bdef4dd] # to [534210bc90eebe4eee2b468402ce595406901a74] # # patch "src/view/MenuBar.h" # from [e36f45a2a082967672a019d83431d8a6c0c8f8dd] # to [3c15ed81f367bad013dfeb2cdd6b5aa24102db2f] # # patch "src/view/Splitter.cpp" # from [d5312983d3d4021820ea6c9a2d5fb6bc772ec0a1] # to [1439b2d0ff0bbfaba191d918313b2c01b054561a] # # patch "src/view/Splitter.h" # from [d5bc3e8758fe387b2f3e6b725894cef55edf7f11] # to [e442f84910e71139c1dccd28ff8123cf21e57f67] # # patch "src/view/TreeView.cpp" # from [108452f506d6ee67ef88aa4fb153863aa39f424d] # to [dcf826574e06d65e22db5a586caeb918673c00d0] # # patch "src/view/TreeView.h" # from [e03e26c64090622a9c2355d1e443e3e77e53c112] # to [7b872f64c09770fed7e6cf2dd321b6a798a05f90] # # patch "src/view/WorkspaceFloater.cpp" # from [676690f16b4a3f3286ae79208936dd8859b65090] # to [94bd8527ee23c8b4b77f10bf6dfb97b23a702818] # # patch "src/view/WorkspaceFloater.h" # from [645db5d659f260ab6b10611a7df5d2424bffe2f9] # to [7096d08765272d1ddbbda305c01ba1adc0b80a7e] # # patch "src/view/WorkspaceMenuBar.cpp" # from [411ab43b97d6437785a9cea40c9aa45cae30eb2b] # to [9b53a8a4b55576cd48adda8634cbd85b5da35d89] # # patch "src/view/WorkspaceMenuBar.h" # from [11e5106fd77b83b3bbb9a5f5d970e0709c53a2db] # to [42a61673b49017a92bc108f2dcf46bcd8a4c5e49] # # patch "src/view/WorkspaceWindow.cpp" # from [2af2e9a9dac69191b72ea1ff6c67aa5ca8359016] # to [a57527afe8592e57cc8c5deb5d0d1f927b81aa5d] # # patch "src/view/WorkspaceWindow.h" # from [ccc33495e5dbe966045065fb35311d07f5f7e96e] # to [ee9feb6b5087706cc2b84f2cafbebcd241d15f0b] # # patch "src/view/dialogs/About.cpp" # from [56849dd96a26feb6b715a44be632dd34944e1b52] # to [94f8bd7362fd5d391682e5b4f81525547c1db295] # # patch "src/view/dialogs/About.h" # from [a9e9e206ccab9eaf927f806ae847359530c87a25] # to [eeeef54f2ffa3bce962b1d9b183dcc4a157b6a67] # # patch "src/view/dialogs/AddEditAttribute.cpp" # from [1f9555c4103d227d66191031fea7b1e9d41462e7] # to [fe5146b5ad9022345783e70cba000ab6ffc8cef4] # # patch "src/view/dialogs/AddEditAttribute.h" # from [aea71c7ba22359058eaccfc8be8d112dd79bf231] # to [efd7bdf982aa2c9761083b1e0d4dfe03300d3da0] # # patch "src/view/dialogs/ApplicationUpdate.cpp" # from [c0b3ef7d07d9095db4f36229c76e3e523b74bffe] # to [1877bdbdb1b60402d2b30335a9312c1a7b9dfbec] # # patch "src/view/dialogs/ApplicationUpdate.h" # from [f98ed4f83d1a3bf7e3455cd1ae644b16d9fd417d] # to [15d58d7ed4e847db2d4669c24fbe4bd894786722] # # patch "src/view/dialogs/ChangesetBrowser.cpp" # from [2f4e311cfeb2a54fcd3d843919802ffcea4972fd] # to [7281ea4d20f313f0383c2fcf41c9e748427f9ad2] # # patch "src/view/dialogs/ChangesetBrowser.h" # from [762d08a1a37e466eaa18c31515fed98bee874398] # to [5fee47bec4ac82fe7a5ea7a091160fe02c423f3e] # # patch "src/view/dialogs/CheckoutRevision.cpp" # from [de2e69f03edb0666452374c0a97a80d50ea8e987] # to [e87e47226ce4c690d8d1019d034ea60c85f92763] # # patch "src/view/dialogs/CheckoutRevision.h" # from [519d02c75386f8576a23484cc59bc8b6bc87004d] # to [643632486232552a5647b6229826ecffae77aa81] # # patch "src/view/dialogs/CommitRevision.cpp" # from [46aa99721df59476868e9b0268854f01a9729259] # to [9c06833957c547802f3c3a0873ed10640f2537a1] # # patch "src/view/dialogs/CommitRevision.h" # from [1d143af306b3bc2d2dc6a714fc4e760f393ccb28] # to [fdc575faa9b56117ee49625e3b70242b180ecb9f] # # patch "src/view/dialogs/DatabaseDialogManager.cpp" # from [0682dfa8ded86ab14e4b0ec82ba796ef516b2c60] # to [bd233a55cd97ce0a3d96f4fd8a89408b63d600dd] # # patch "src/view/dialogs/DatabaseDialogManager.h" # from [4a760e7161b0fa7d80f42cd072697d68b9fc7ab6] # to [0634ee9c6523ae5cf8df8ff7b3a6efa38163dde1] # # patch "src/view/dialogs/Dialog.cpp" # from [7c1dd6b8d0a48131d275bef34bcf5a9f562b6283] # to [9cd98e1445614adc0bb33b4ed5bf8858b705400c] # # patch "src/view/dialogs/Dialog.h" # from [99c69a70477eb8ae638eed80a94766385f28667a] # to [4e6ee1ac9f09821bd37f888f8aaabb12663a6a5b] # # patch "src/view/dialogs/DialogManager.cpp" # from [109413ef4db839312f5084c1bc5e0b2cdd4093b1] # to [567fbd5fdfec301a8a4d048a030395825f173266] # # patch "src/view/dialogs/DialogManager.h" # from [0a0c6eab2209d8a96f277d922231e469a0521aa2] # to [bc1e7578538c2981d6b2ba995e18c13b23b17d65] # # patch "src/view/dialogs/FileDiff.cpp" # from [3ca14f49640303a7a64cb0def33be2a4a1a519be] # to [1f8c9243580e4617bf3a9887cbb0ec0cbc78a225] # # patch "src/view/dialogs/FileDiff.h" # from [94a31f0695e5ab4097ec6f32d4a71ac6e5f83348] # to [ba57120aa6697586ec041e4dbb6175927cc49861] # # patch "src/view/dialogs/FileHistory.cpp" # from [204d49ef1ffcd08420370989ccec8a32b442d16c] # to [57e211a968aec67716db2f91d43d9c64c6299865] # # patch "src/view/dialogs/FileHistory.h" # from [eb768f1271107bf134a815d8fd1481de89a147ee] # to [d543deea2159e969268866f3626cedfc441f84b3] # # patch "src/view/dialogs/GenerateKeypair.cpp" # from [95a0048f05748ce4027fa0fdefb72516e516b25e] # to [6ed24f6d1bcee46cd89605ecbe0c3c5a6b17475c] # # patch "src/view/dialogs/GenerateKeypair.h" # from [281a4381ce6b78b6e250ea9a75de4220904ffba4] # to [7c03b44f2a4ab18dc5125a5f59474f356f84a00d] # # patch "src/view/dialogs/KeyManagement.cpp" # from [c8f50b35dc4da3073521bcb2695cc600698edf7c] # to [7a7746b6f8945ae315ccb6162dbbc1af6febcbb2] # # patch "src/view/dialogs/KeyManagement.h" # from [f9121cb1b7b400b9b5fd2da1d30fcc1f4d669fa4] # to [89f6ca59ea789e2c4a3cbd3ee0812c07c2c179aa] # # patch "src/view/dialogs/OpenPrompt.cpp" # from [0398da0a68a5c3302d91b6232189abedce01c8ee] # to [cb2a6c25e78678efb597a83d1f6fb42d635fcd14] # # patch "src/view/dialogs/OpenPrompt.h" # from [09ca822351519c6c01d079b3aaaaf5a43f3963a3] # to [8cdfb40d1faaa80d3d366f83ed9bd6019212dda2] # # patch "src/view/dialogs/Preferences.cpp" # from [62c7d6fe31de9db358bff248db6a939786347670] # to [d1f74302d4a191be707d1011732c3fbd2ce131a1] # # patch "src/view/dialogs/Preferences.h" # from [158ed167709f8220efc4d958319c8a60da2eaa45] # to [0e794e935acc480185792cfd839e5e445a0d1d16] # # patch "src/view/dialogs/RevisionDiff.cpp" # from [1361bc56009d31b862f27759fae0d02a36c0d78b] # to [c03a05117e11c00a098e0fd55b09385dc7cb205c] # # patch "src/view/dialogs/RevisionDiff.h" # from [8f6e3ad38608c0c958525a95b42e4998c29876ea] # to [e536991efd9001e62a385f86c7130ea26b2cbee7] # # patch "src/view/dialogs/RevisionManifest.cpp" # from [4965902b6ef1e583149e4ec1a76bca7db4cddaf5] # to [2d81703aa99b208169d84eb9573bc262c8019ae0] # # patch "src/view/dialogs/RevisionManifest.h" # from [8ac1d3278d8818c5dae1d245e9062fa40bd9ddd1] # to [9dba97aea72178322d909583bb5ce92b3a5dd116] # # patch "src/view/dialogs/SelectRevision.cpp" # from [86df3a95f7b536d6742f90cfa711fbad5f26d488] # to [59edae38fa0c050495462308b2c279224a7f9357] # # patch "src/view/dialogs/SelectRevision.h" # from [f1cfe5155117d125ded2e64917bf2263b425c263] # to [b9d7c86fcc38c8e035a24a251d6cc922ae7a717e] # # patch "src/view/dialogs/UnaccountedRenames.cpp" # from [4ff91392b7562f86f5b07d4c90fe751727dc57a5] # to [25d128e8323df0b45c5b81168a5f2e5a38611e2f] # # patch "src/view/dialogs/UnaccountedRenames.h" # from [8d45c36f953a2e7de5605f04bdd3bac9b6a282ff] # to [5289ad6e72401ed91ec2494aee91b99dcd892b1c] # # patch "src/view/dialogs/UpdateWorkspace.cpp" # from [45eb6677d65feb3c3bbdf697ea88c5566ec36c02] # to [fc8e3ff3f490dffea8fd906bfdc4f014756906f7] # # patch "src/view/dialogs/UpdateWorkspace.h" # from [6765da7bd5234328ac89863f69cb23fcb4bcb6e3] # to [d51f6698c1e9b13c89b660fff1dd0944e5095365] # # patch "src/view/dialogs/WorkspaceDialogManager.cpp" # from [052fef6ee22f29c32c391a7ba659852f78328496] # to [dd484a907c3f11a9c073fc3fcd7e2778360ee831] # # patch "src/view/dialogs/WorkspaceDialogManager.h" # from [83005973338a03cde630f2dea7a4115d21bb20a6] # to [e874a262a700fda55d233642fecb0f7d59ce0240] # ============================================================ --- COPYING 0b184ad51ba2a79e85d2288d5fcf8a1ea0481ea4 +++ COPYING 8624bcdae55baeef00cd11d5dfcfa60f68710a02 @@ -1,301 +1,642 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". + TERMS AND CONDITIONS -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. + 0. Definitions. - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. + "This License" refers to version 3 of the GNU General Public License. -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. + A "covered work" means either the unmodified Program or a work based +on the Program. - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: + 1. Source Code. - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. + The Corresponding Source for a work in source code form is that +same work. - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License. - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. + 13. Use with the GNU Affero General Public License. -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. + 14. Revised Versions of this License. - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. - NO WARRANTY + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. + 15. Disclaimer of Warranty. - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + 16. Limitation of Liability. + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least +state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -304,37 +645,30 @@ the "copyright" line and a pointer to wh GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see . - Also add information on how to contact you by electronic and paper mail. -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. ============================================================ --- README a0d51c7091e46ebc2f710f2378a2ff9a0a3fe74e +++ README 0f12d254a4714783608dc81b5e4c6084136dc2c8 @@ -1,10 +1,11 @@ guitone - a Qt-Frontend for monotone ==================================== -Guitone is a frontend to monotone. It implements the monotone automation -interface, so its likely that it won't do things which aren't implemented there -(currently for example workspace actions like update and commit). +Guitone is a frontend to the monotone revision control system. It aims towards +a full implementation of the monotone automation interface and is especially +targeted at beginners. Guitone is copylefted under the terms of the GNU General +Public License Version 3, or, at your option, any later version of this license. You need Qt >= 4.3 to build and monotone >= 0.37 (or a monotone with an interface version of 6.0 or greater) to run guitone. Earlier ============================================================ --- src/Guitone.cpp b62776a0951ebab724cf59adb3130f80e291f0fc +++ src/Guitone.cpp fe9bdfadb6f31a3ac4a79144bd3196b23d159a99 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Guitone.h" ============================================================ --- src/Guitone.h 58b322d7d904b8d40ac3199c369d2f26e9e8caa1 +++ src/Guitone.h 0019cd72ab359d06301a1d5e8321c3f284351a4c @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef GUITONE_H ============================================================ --- src/main.cpp 60049867487708f7eb18c012c34641041114aec8 +++ src/main.cpp 54663c130ac11f434a0cef52cfe02616894b0176 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "DebugLog.h" ============================================================ --- src/model/Ancestors.cpp 29675a51f35055b31a8692143e8e821bb8e47420 +++ src/model/Ancestors.cpp 40b168cdabbc4fbab891933ff9bd174bc434e4c6 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Ancestors.h" ============================================================ --- src/model/Ancestors.h a6b0213eed2a40a255465157f84d91c1d61224a4 +++ src/model/Ancestors.h ae731fc84d04770fda2c286a3f717d9c2f2759ba @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef ANCESTORS_H ============================================================ --- src/model/AutomateCommand.cpp cb33a7922177d9b07d46bc81ecc1453f92c96c8e +++ src/model/AutomateCommand.cpp e98dedabd7391e9921f015cea8f272d2c48e719e @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "AutomateCommand.h" ============================================================ --- src/model/AutomateCommand.h c8c94874519a7d87fc7dc9ea2264485f0e7f5ba0 +++ src/model/AutomateCommand.h d0ad218af3a52074a5b41fc6590804f2a96b6a0e @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef AUTOMATE_COMMAND_H ============================================================ --- src/model/Branches.cpp ea39d230ea1aea5c8a629242985901757c9ecb4b +++ src/model/Branches.cpp d0a1ee6db5af0f1a7cdf864d070868a6d87d4532 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Branches.h" ============================================================ --- src/model/Branches.h fccb87b89b30e4fc485b56b24b17d45865750846 +++ src/model/Branches.h 8edacdc16749a3a6728efc6de407fed41708242a @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * ============================================================ --- src/model/Certs.cpp 147bef5808860b7085a17ee44b949ed87e72b6bc +++ src/model/Certs.cpp 7d7c566ba3e4796e8b65d558fbb9bdb068bda5a9 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Certs.h" ============================================================ --- src/model/Certs.h c7be6e51d96a5b160aa89fe5984a753aab7e3d3d +++ src/model/Certs.h 3aae2258184a7ea076935b471ebee44baf7bf1f5 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef CERTS_H ============================================================ --- src/model/ChangesetModel.cpp dac0c2a9b597ffd6fcae4ef11be1cdb5767bfbb8 +++ src/model/ChangesetModel.cpp d2d1f6b94d41e49a6d8127dc110bf02261e54a7d @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "ChangesetModel.h" ============================================================ --- src/model/ChangesetModel.h 9ce3de2a7bb54b90e2b303e957a2f6adcbd13c11 +++ src/model/ChangesetModel.h 96d199343b00c0f9cca4d49246392ff6cbfcab1a @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef CHANGESETMODEL_H ============================================================ --- src/model/ContentDiff.cpp fb04d00840d5162745dcfa5717211b578ee03bb2 +++ src/model/ContentDiff.cpp ff1f36cc79508208262bac9b577edfa4bdb8bad0 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "ContentDiff.h" ============================================================ --- src/model/ContentDiff.h 05f150811f860b606483142aca7c3597b367a7c8 +++ src/model/ContentDiff.h e89ba83d45953a4cfc745a4c7ad475e9733c37ff @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef CONTENT_DIFF_H ============================================================ --- src/model/GetAttributes.cpp f270dea5c62bba8010b641fc5e2868d4d3db412f +++ src/model/GetAttributes.cpp ed421d842b53dc2400e2c1adaae282c53e34c250 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "GetAttributes.h" ============================================================ --- src/model/GetAttributes.h 5a6dd679c9422d351eb257d1112b92c66af8ad8f +++ src/model/GetAttributes.h f34a9cc218e83e5dfeed11b7c9929e8b49c2a9cc @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef GETATTRIBUTES_H ============================================================ --- src/model/GetBranchLog.cpp efea9b6fa86857e3563d2ebc15a6dda069ddae6a +++ src/model/GetBranchLog.cpp dffad69f432f8b3092213ef263bac4a9a1f524d6 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "GetBranchLog.h" ============================================================ --- src/model/GetBranchLog.h b5bba049dabe1b6de146eaf5ba81ae26928240a0 +++ src/model/GetBranchLog.h fd90592e93fa215361bfd6e9f9c7574c138a2fd6 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef GETBRANCHLOG_H ============================================================ --- src/model/GetContentChanged.cpp ce555349e11ada4c5e5212099806c1a62741f2fc +++ src/model/GetContentChanged.cpp 722cb14ca2adcc68a73ce4407f8b47caf0dd1cb8 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "GetContentChanged.h" ============================================================ --- src/model/GetContentChanged.h a9265c18e8ec3639c6aa5248da12bbd0350b844d +++ src/model/GetContentChanged.h f906c204fe129f2b10e00f9514efeaff8750ded3 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef GETCONTENTCHANGED_H ============================================================ --- src/model/GetFile.cpp 1bf34182253597a267fbdbb3df6d8310307f2ca0 +++ src/model/GetFile.cpp c7c56add3d7c44df2b73a16c1884f5b73d232aba @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "GetFile.h" ============================================================ --- src/model/GetFile.h 017efe23e86731dbbfc7dabb40fccefe3d3632c9 +++ src/model/GetFile.h 7a964370cd74cd5aa333751d9966fb72c1fc44c1 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef GET_FILE_H ============================================================ --- src/model/GetFileProxyModel.cpp 8b19a1596259f8400fb4d857bd6599ecf0163a61 +++ src/model/GetFileProxyModel.cpp 003468ec344631ba5d09f39a052e463c20c0f9d8 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ ============================================================ --- src/model/GetFileProxyModel.h adc53b614cef541e150d407316cb8d3b1bd58afc +++ src/model/GetFileProxyModel.h 06ba895049c8f73ddca295f765966924661b9563 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef GETFILEPROXYMODEL_H ============================================================ --- src/model/GetRevision.cpp 10be062fbe81f5de0a67a8326cda76b950d7e003 +++ src/model/GetRevision.cpp f9f9f77f0cdd62b2fbe5d06e896db8c954d2b197 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "GetRevision.h" ============================================================ --- src/model/GetRevision.h 7426be701691a6da5c1ea9a27956db2dca40d326 +++ src/model/GetRevision.h d6d94d54c3a9227e7df4d9603143419944a24691 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef GET_REVISION_H ============================================================ --- src/model/Inventory.cpp 57255fca3e26efb58b0e5b8cc6435a130ad9bb17 +++ src/model/Inventory.cpp bf6c3eaa94c9b466b27b46d6071235981556b94b @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ ============================================================ --- src/model/Inventory.h 255f1d2dbb9f60515e659894c43ef81ab528a04a +++ src/model/Inventory.h c45f6b4c627eae8b928f76d14c5e5cdd56c1e4ba @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef INVENTORY_H ============================================================ --- src/model/InventoryItem.cpp da1dbcf421b48be5faff31386c36328b1190092b +++ src/model/InventoryItem.cpp f37721d4b5f0b5656e7969d381ebf003a9d120ac @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "InventoryItem.h" ============================================================ --- src/model/InventoryItem.h 2f8c89970fb09c802554de1646fba71c0b1b5748 +++ src/model/InventoryItem.h 938dd7727633951c9ac80d40d358310db7708b19 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef INVENTORY_ITEM_H ============================================================ --- src/model/InventoryProxyModel.cpp 389f45374d65a9cdfb920f89dd3277d1184d17a4 +++ src/model/InventoryProxyModel.cpp ab51a52e28547434aa55ad4135fc535eaa513363 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ ============================================================ --- src/model/InventoryProxyModel.h a7239616d0752740a3dfc9bd65d6d31ad2fe1973 +++ src/model/InventoryProxyModel.h feb55b88ad3148ca79c6b03117b77c3d251bed57 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef INVENTORYPROXYMODEL_H ============================================================ --- src/model/Keys.cpp 3ccd0eae5ac689784457e9d8edaac8f3ae667da3 +++ src/model/Keys.cpp 19dfda529004934172d6ceb4511eae24e30af3f6 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Keys.h" ============================================================ --- src/model/Keys.h f5bcda560a03b830c14c8f8c369b4a96f695704d +++ src/model/Keys.h ebd6f123cf516f8d150820ec8b89c10038cb3cd2 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef KEYS_H ============================================================ --- src/model/Manifest.cpp dccb314934d5ea95631976a992ebe532c57c39f1 +++ src/model/Manifest.cpp 235f3ddeb0e0514934b9df6f619e87ceb9d6f387 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Manifest.h" ============================================================ --- src/model/Manifest.h e482dcbaf3c30bd2a61773af588c7e6ff681df96 +++ src/model/Manifest.h 40134a38a50a1e1fca501963c82b6aa822477bd3 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef MANIFEST_H ============================================================ --- src/model/Select.cpp d1b4aa62ba14950f1c8dbc53caa5ad6041d0cdfc +++ src/model/Select.cpp ca967f456759195df4c53ec6922c0a8967273c35 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Select.h" ============================================================ --- src/model/Select.h 5a925619f7bacf030b7522d9e9e2edcb6b94bcd7 +++ src/model/Select.h 520e6de98e71ac10e9e72ac5341f725302096816 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef SELECT_H ============================================================ --- src/model/Tags.cpp e5798cb9a2ce40be834b5066b014d23ce4ed267a +++ src/model/Tags.cpp 80d62375cd40c37849eacf93a0bcb61d3983175b @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Tags.h" ============================================================ --- src/model/Tags.h f2e018cc8573864ec37d59bccae044789ba8f7cc +++ src/model/Tags.h f2fba601247219ecee7aae5c7ddff42aacfb872f @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef TAGS_H ============================================================ --- src/model/Toposort.cpp 9fec281ab3ffd60c7a7eb2f01cd07cdb1734a88e +++ src/model/Toposort.cpp 0100c237385ea177420b36a3daa5d7642ea49f89 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Toposort.h" ============================================================ --- src/model/Toposort.h 30f5a31bfba3f1af1d5eade39b7f04790ff54335 +++ src/model/Toposort.h 85ef196576a29c5d66202858fbe131e4a53e9332 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef TOPOSORT_H ============================================================ --- src/monotone/FileExporter.cpp d66aabfa3ab17e27a8464b4721ff0d47f2a5cf56 +++ src/monotone/FileExporter.cpp dc29c89ec8f7ac23b25811a34d88b442855890a9 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "FileExporter.h" ============================================================ --- src/monotone/FileExporter.h c563d3d55236f6f05c5301b9e27e15e63e34e60a +++ src/monotone/FileExporter.h 44a4bb7eb2d4f29f3c958bd41ecaa7588a5993a3 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef FILE_EXPORTER_H ============================================================ --- src/monotone/MonotoneManager.cpp cb2c38e6c54d4a1c7cdb5936ee6fd7b4d929e4d6 +++ src/monotone/MonotoneManager.cpp b4c54e815d640974832786998cc69e5e3a54dd56 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "MonotoneManager.h" ============================================================ --- src/monotone/MonotoneManager.h ca14810692315d4a9d58d2c220ecbd00a2e69e20 +++ src/monotone/MonotoneManager.h 84e8236e6576ec4b8a1c2437299b32c7089265c5 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef MONOTONE_MANAGER_H ============================================================ --- src/monotone/MonotoneThread.cpp cc51913105c329f227b953d1cca58ed349d2ed8a +++ src/monotone/MonotoneThread.cpp 3696f27d199a112883ddd7a9f0262ae760c2107c @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "MonotoneThread.h" ============================================================ --- src/monotone/MonotoneThread.h 031a0d05e8b118a3fccc468c8b90b959ed89d0d2 +++ src/monotone/MonotoneThread.h d4c4f289165b23192b2320242e7b89c874614f64 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef MONOTONE_THREAD_H ============================================================ --- src/monotone/MonotoneUtil.cpp 337414f278e2f74e22c73a134de0e40d475a7af9 +++ src/monotone/MonotoneUtil.cpp 7f47e03698a62113c610433e79677e8fcad36c67 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ ============================================================ --- src/monotone/MonotoneUtil.h 8577a38758622b8248682a538b53388640cf382a +++ src/monotone/MonotoneUtil.h 7173990600fd78e4e75a5bc0111d2c29e2a06ed7 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef MONOTONE_UTIL_H ============================================================ --- src/monotone/WorkspaceCommitter.cpp fec464ea30accdfdf993c11c1479f4b5303288a6 +++ src/monotone/WorkspaceCommitter.cpp 8ef7bebbbcdc720ff1aa53ac9090cd3362488620 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "WorkspaceCommitter.h" ============================================================ --- src/monotone/WorkspaceCommitter.h 19ad4daf22ac0416f00057e20524086a4d95b0a7 +++ src/monotone/WorkspaceCommitter.h e868a69ebf244aa67a0d02ef7a9372e798754fd8 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef WORKSPACE_COMMITTER_H ============================================================ --- src/monotone/WorkspaceCreator.cpp 7d51f6200bed2e9b2dba2117af5e9fe02e176867 +++ src/monotone/WorkspaceCreator.cpp 9bcaa2976315b76053c4161f56b4dede0cf8d8d3 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "WorkspaceCreator.h" ============================================================ --- src/monotone/WorkspaceCreator.h f30353cccd83fcb6eb845ea9d9f86531daf9cc68 +++ src/monotone/WorkspaceCreator.h 083cbaffb7e152b00c45b8c4fc07aa86e3ebdaea @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef WORKSPACE_CREATOR_H ============================================================ --- src/util/AbstractParser.cpp 07d457cc3931cd2f4f384b8313f50555f2048692 +++ src/util/AbstractParser.cpp 9ad88bd1dd7dee2fce1360f5a21dac9bd6164287 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ ============================================================ --- src/util/AbstractParser.h 5d83ade859fbf057e5326f2bdcf8b0f6560a5be2 +++ src/util/AbstractParser.h 71c0f2ebbfd02e654b2f32dec72b698d39d68441 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ @@ -30,7 +30,7 @@ public: AbstractParser(const QByteArray &); AbstractParser(const QString &); virtual ~AbstractParser(); - + virtual bool parse() = 0; inline QByteArray getLeftBytes() const { return input; } ============================================================ --- src/util/BasicIOParser.cpp f11c59b9074eee097cb97feea7f93bdd146ccb0d +++ src/util/BasicIOParser.cpp 92345de7cfa61c17763d9f0089612714d4a3fdcf @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ @@ -38,7 +38,7 @@ Stanza BasicIOParser::getStanza() Stanza BasicIOParser::getStanza() { Stanza stanza; - + while (true) { char next = whatsNext(); @@ -51,7 +51,7 @@ Stanza BasicIOParser::getStanza() W("Couldn't get symbol."); } QString hash(getHash()); - + // was this a hash? if (!hash.isNull()) { @@ -70,7 +70,7 @@ Stanza BasicIOParser::getStanza() } } stanza.append(entry); - + eatSpaces(); char cur = getNext(); if (cur != '\n') @@ -78,7 +78,7 @@ Stanza BasicIOParser::getStanza() W(QString("Expected '\\n', got '%1'").arg(cur)); } } - + return stanza; } @@ -97,7 +97,7 @@ QString BasicIOParser::getSymbol() } break; } - + // ascii conv is enough here return QString(payload); } @@ -107,7 +107,7 @@ QString BasicIOParser::getValue() eatSpaces(); if (whatsNext() != '"') return QString(); advance(); - + QByteArray payload; char last = '\0'; while (true) @@ -119,7 +119,7 @@ QString BasicIOParser::getValue() last = cur; payload.append(cur); } - + QString ret = QString::fromUtf8(payload); ret.replace("\\\\", "\\"); ret.replace("\\\"", "\""); @@ -131,18 +131,18 @@ QString BasicIOParser::getHash() eatSpaces(); if (whatsNext() != QChar('[')) return QString(); advance(); - + // special case: nonexistant revision ID if (whatsNext() == QChar(']')) { advance(); return QString(""); } - + int hashLen = 40; QString ret = QString::fromUtf8(input.mid(0, hashLen).data()); advance(hashLen); - + char ch = whatsNext(); if (ch == QChar(']')) { ============================================================ --- src/util/BasicIOParser.h b96df0f29dd64ac740c6e8a7f34c080406d3837e +++ src/util/BasicIOParser.h 3028f25ad04d938ea6dfc4588f49f96aa3923382 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ @@ -28,10 +28,10 @@ public: { public: BasicIOParser(const QString &); - + bool parse(); inline StanzaList getStanzas() const { return stanzas; } - + private: Stanza getStanza(); QString getSymbol(); ============================================================ --- src/util/BasicIOWriter.cpp 7965db7212e1d26f78c7923a3c8add0fd8dd46b7 +++ src/util/BasicIOWriter.cpp b024367720fc5840135057e261e7d6cdd380ffa1 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ @@ -41,7 +41,7 @@ QString BasicIOWriter::writeStanza(const { // ensure that not both, a hash and a value list, are given I(!(!en.hash.isNull() && en.vals.size() > 0)); - + if (!en.hash.isNull()) { out.append(writeHashLine(en)); ============================================================ --- src/util/BasicIOWriter.h 052ca233a44fa5c872b699b5eee4fd4cc6187f1b +++ src/util/BasicIOWriter.h ac6d388027ae3cc382f957275561a643e32ff6de @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ @@ -28,10 +28,10 @@ public: public: BasicIOWriter(const StanzaList &); ~BasicIOWriter(); - + QString write(); - - + + private: QString writeStanza(const Stanza &); QString writeHashLine(const StanzaEntry &); ============================================================ --- src/util/DebugLog.cpp 513339e2eb09994edeed4ad8ed3d98b9a6101c81 +++ src/util/DebugLog.cpp 7b0350e236c93cd7e080e3bb6cf52aff7da94808 @@ -1,10 +1,10 @@ /************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ @@ -32,11 +32,11 @@ DebugLog* DebugLog::singleton() DebugLog* DebugLog::singleton() { - if (!instance) - { - instance = new DebugLog(); - } - return instance; + if (!instance) + { + instance = new DebugLog(); + } + return instance; } DebugLog::DebugLog() @@ -45,19 +45,19 @@ DebugLog::DebugLog() fileLogging = Settings::getFileLogEnabled(); int level = Settings::getLogLevel(); if (level >= Fatal && level <= Debug) logLevel = static_cast(level); - + if (fileLogging && !openLogfile()) { critical(QString("Cannot open logfile '%1' for writing, " "disable file logging.").arg(logFilePath())); fileLogging = false; } - + QString sep; QDate today = QDate::currentDate(); sep.fill('=', 40); log(Info, sep); - log(Info, + log(Info, QString(" guitone session started (%1)") .arg(today.toString("yyyy-MM-dd")) ); @@ -72,39 +72,39 @@ bool DebugLog::openLogfile() bool DebugLog::openLogfile() { logFile.setFileName(logFilePath()); - + QFlags flags = QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text | QIODevice::Unbuffered; - + if (!logFile.open(flags)) return false; - + return true; } void DebugLog::log(Type t, QString msg) { if (!fileLogging && !consoleLogging) return; - + if (logLevel == Fatal && t > Fatal) return; if (logLevel == Critical && t > Critical) return; if (logLevel == Warn && t > Warn) return; if (logLevel == Info && t > Info) return; if (logLevel == Debug && t > Debug) return; - + QMap errors; errors[0] = "fatal"; errors[1] = "critical"; errors[2] = "warning"; errors[3] = "info"; errors[4] = "debug"; - - // do not use I here since this calls qFatal and results in + + // do not use I here since this calls qFatal and results in // an endless loop assert(t <= errors.size()); - + QTime now = QTime::currentTime(); - + QString logStr; logStr.append( QString("%1: %2: %3\n") @@ -112,15 +112,15 @@ void DebugLog::log(Type t, QString msg) .arg(errors[t-1]) .arg(msg) ); - + QByteArray utf8_msg = logStr.toUtf8(); - + // print the message on console if (consoleLogging) { fprintf(stderr, utf8_msg.constData()); } - + // print the message to the logfile if (fileLogging && logFile.isOpen()) { ============================================================ --- src/util/DebugLog.h 94f2cac41d2381a8ab113dc5adb29131844beaf4 +++ src/util/DebugLog.h dc63b4ee3fb60f00c62c32e7c4634e75bc6eae98 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef DEBUG_LOG_H @@ -27,24 +25,24 @@ public: class DebugLog : public QObject { public: - // higher levels include lower ones, i.e. + // higher levels include lower ones, i.e. // 'warn' also prints out 'critical' and 'fatal'; // 'debug' prints out everything we have enum Level {Fatal = 1, Critical, Warn, Info, Debug }; // as we have different Levels each level's name is also // the name for a specific log type typedef Level Type; - + static void setFileLogEnabled(bool); static void setConsoleLogEnabled(bool); static void setLogLevel(int); - + static bool getFileLogEnabled(); static bool getConsoleLogEnabled(); static int getLogLevel(); - + static QString logFilePath(); - + static void info(QString); static void debug(QString); inline static void debug(const char * msg) { return debug(QString::fromUtf8(msg)); } @@ -54,22 +52,22 @@ public: inline static void critical(const char * msg) { return critical(QString::fromUtf8(msg)); } static void fatal(QString); inline static void fatal(const char * msg) { return fatal(QString::fromUtf8(msg)); } - + private: - - DebugLog(); - ~DebugLog(); + + DebugLog(); + ~DebugLog(); bool openLogfile(); void closeLogfile(); void log(Type, QString); - + bool consoleLogging; bool fileLogging; Level logLevel; QFile logFile; - - static DebugLog * singleton(); - static DebugLog * instance; + + static DebugLog * singleton(); + static DebugLog * instance; }; ============================================================ --- src/util/DiffParser.cpp 32f4fa2ef30289c8834b08a70bfb69ab242b6e04 +++ src/util/DiffParser.cpp 67f905dd877d8cf230fde2b56f38395e55492743 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ ============================================================ --- src/util/DiffParser.h e8f97b0c38907a7742f69ec562e738df29d0b5e5 +++ src/util/DiffParser.h c8b6c48904a0c047a04dcd98a924611760ed64de @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ @@ -68,7 +68,7 @@ public: ~DiffParser(); Diff * getDiff(const QString &); inline FileDiffs getAllDiffs() const { return fileDiffs; } - + private: void parse(const QString &); FileDiffs fileDiffs; ============================================================ --- src/util/IconProvider.cpp 01301a1df50a721db13507ee5ded6d953a849dd7 +++ src/util/IconProvider.cpp 723f264a970d108792822b333278b521d2abcb61 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "IconProvider.h" ============================================================ --- src/util/IconProvider.h 28d9295d56473b98521a31e71a60d6afb1bb8697 +++ src/util/IconProvider.h 6073f11bce3d1c9679935a7b463ebecd5dfe7dc9 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef ICONPROVIDER_H ============================================================ --- src/util/Platform.cpp 74b04910e5146544a2694650ae32ec490e1115c0 +++ src/util/Platform.cpp be69d819cd16b15140aea1252a77ec212267f0c3 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ ============================================================ --- src/util/Platform.h 992ab64a32420a430ace5f8597ab78ca7979d859 +++ src/util/Platform.h 2c5278c532dfa37b2f0f2b6145704b3a536d307b @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ ============================================================ --- src/util/Settings.cpp 1101bd4a627996f8fe9f6ce52eb82a1f37e81c63 +++ src/util/Settings.cpp 6256bdd52ba6a391bd31ad0b1bd74e7a5e1dde0c @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ ============================================================ --- src/util/Settings.h 1fd9fd774712efeb13b3d3916f314d35071dc6a0 +++ src/util/Settings.h c270582aa028c7a903405c024cabd2e6ed0cb965 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef SETTINGS_H ============================================================ --- src/util/SignalWaiter.cpp d9179faf3f72dc87e7de72d6806b1d9618cc1cda +++ src/util/SignalWaiter.cpp e3b857d7058788806704e69d160efd2563e8bf80 @@ -6,7 +6,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -15,11 +15,9 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ - + #include "SignalWaiter.h" #include "vocab.h" @@ -27,12 +25,12 @@ SignalWaiter::SignalWaiter(const QObject #include SignalWaiter::SignalWaiter(const QObject* sender, const char* signal) - : QObject(0) + : QObject(0) { I(sender && signal); connect(sender, signal, this, SLOT(signalCaught())); -} - +} + // Returns true if the signal was caught, returns false if the wait timed out bool SignalWaiter::wait(const QObject* sender, const char* signal, int msec) { @@ -56,15 +54,15 @@ bool SignalWaiter::wait(int msec) { // Check input parameters if (msec < -1) return false; - + // activate the timeout if (msec != -1) timer = startTimer(msec); - - // Begin waiting + + // Begin waiting ready = timeout = false; while (!ready && !timeout) QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents); - + // Clean up and return status killTimer(timer); return ready || !timeout; ============================================================ --- src/util/SignalWaiter.h ae0b9b4faf37d59c592b57d9c41b54c629532e26 +++ src/util/SignalWaiter.h 24eee3021bd2745af443823b08063f65548d8f5b @@ -6,7 +6,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -15,11 +15,9 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ - + #ifndef SIGNALWAITER_H #define SIGNALWAITER_H ============================================================ --- src/util/StdioParser.cpp 8717de07c9d5404df76f6e789edda3f5b17d4824 +++ src/util/StdioParser.cpp ffbfb4a6dfb2870877d0161a8ec54bc8cce365a4 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ @@ -26,7 +26,7 @@ bool StdioParser::parse() bool StdioParser::parse() { if (input.size() == 0) return false; - + // chunk format: :::: commandNumber = getNumber(); I(getNext() == ':'); @@ -37,16 +37,16 @@ bool StdioParser::parse() I(getNext() == ':'); chunkSize = getNumber(); I(getNext() == ':'); - + int charsLeft = input.size(); if (chunkSize > charsLeft) { return false; } - + payload = input.mid(0, chunkSize); advance(chunkSize); - + return true; } @@ -54,7 +54,7 @@ int StdioParser::getNumber() { int number = 0; int processedChars = 0; - + while (char ch = whatsNext()) { if (ch < '0' || ch > '9') @@ -68,7 +68,7 @@ int StdioParser::getNumber() advance(); processedChars++; } - + return number; } ============================================================ --- src/util/StdioParser.h ed0742f484843b709c946a2c030cca934432335d +++ src/util/StdioParser.h 2b4e6866c2b7d81e144ed1fad148e44060152b83 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ @@ -27,17 +27,17 @@ public: { public: StdioParser(const QByteArray &); - + bool parse(); inline int getCommandNumber() const { return commandNumber; } inline int getErrorCode() const { return errorCode; } inline char getChunkType() const { return chunkType; } inline int getChunkSize() const { return chunkSize; } inline QByteArray getPayload() const { return payload; } - + private: int getNumber(); - + int commandNumber; int errorCode; char chunkType; ============================================================ --- src/util/TreeBuilder.cpp 974da1b2402a50df3b002069411b67b0915f870b +++ src/util/TreeBuilder.cpp f06e614c4227c5a31bd6df57799cfcbf9ac77c09 @@ -1,10 +1,10 @@ /************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * +* the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * +* along with this program. If not, see . * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ ============================================================ --- src/util/TreeBuilder.h a4acd39e265420a666b119b38d2f32b926ab85a9 +++ src/util/TreeBuilder.h d195b4bba70b39269efdf3e30314667df1236db3 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef TREEBUILDER_H ============================================================ --- src/view/AttributesView.cpp 1a9ca66bb8fcee26e941b962d4f3d9efe975b417 +++ src/view/AttributesView.cpp 16d96b10bf5eccb0648dc457294b0d4866494154 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "vocab.h" ============================================================ --- src/view/AttributesView.h a597ffe195bc7ac5bf32eb627f3c8c9262f3ab84 +++ src/view/AttributesView.h 6b308b6fc8efef73c592ee0a4f23c2a011c5e6b1 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef ATTRIBUTES_VIEW_H ============================================================ --- src/view/DatabaseMenuBar.cpp 6236815c5b8c7646cea7b748507155e2a13adeef +++ src/view/DatabaseMenuBar.cpp eb1cb0434b4cb5e2538fbc2b955f4dbf1d57a167 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "DatabaseMenuBar.h" ============================================================ --- src/view/DatabaseMenuBar.h f435f33761943e4613197a3a842631761455b821 +++ src/view/DatabaseMenuBar.h c1c37db07324335a585574efaec0d73a8d8608f7 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef DATABASE_MENU_BAR_H ============================================================ --- src/view/DatabaseWindow.cpp 301858460154bc94a7d4b433f40f2654716299bd +++ src/view/DatabaseWindow.cpp 355bc712383817ec469988c32e8161a8ea6ef1db @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "DatabaseWindow.h" ============================================================ --- src/view/DatabaseWindow.h fcbed5e70a24525711b45b6f840dde9c9fa94527 +++ src/view/DatabaseWindow.h 4ba5d2d0af75f7731e952719f726d9cf7c5258ad @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef DATABASEWINDOW_H ============================================================ --- src/view/DiffStatusView.cpp 220dc080d58073f2c4265f0ee80e51cc11bc4178 +++ src/view/DiffStatusView.cpp 47387935d22581b12a4f8aa72f801a84f11c594d @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "DiffStatusView.h" @@ -42,21 +40,21 @@ QSize DiffStatusView::sizeHint() const return QSize(10, 200); } - + void DiffStatusView::paintEvent(QPaintEvent *) { if (!model) return; - + QPainter painter(this); - + float lineHeight = (float) height() / model->rowCount(); float lastY = 0.f; - + for (int i=0, j=model->rowCount(); iindex(i, 0, QModelIndex()); QVariant var = model->data(index, Qt::BackgroundRole); - + if (var.canConvert()) { painter.fillRect( @@ -67,7 +65,7 @@ void DiffStatusView::paintEvent(QPaintEv var.value() ); } - + lastY += lineHeight; } } ============================================================ --- src/view/DiffStatusView.h fe66722b8b8fdf7076471e7e14c1c5d135aa4ada +++ src/view/DiffStatusView.h 21d7658010a88b6b5e67f0603e7844e83937f0fc @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef DIFF_STATUS_VIEW_H @@ -26,11 +24,11 @@ class DiffStatusView : public QWidget class DiffStatusView : public QWidget { - Q_OBJECT + Q_OBJECT public: DiffStatusView(QWidget*); - ~DiffStatusView(); + ~DiffStatusView(); void paintEvent(QPaintEvent*); inline void setModel(GetFileProxyModel * m) { model = m; } QSize minimumSizeHint() const; ============================================================ --- src/view/InventoryView.cpp 8104c73eb4fd60d9b8eb5363109b7abdc1953f83 +++ src/view/InventoryView.cpp d66ba062f6aa10dcc2902bfb3cc938677085b884 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "InventoryView.h" ============================================================ --- src/view/InventoryView.h de7bdd693c187a8611d3af9b80ae05fdd56f6e40 +++ src/view/InventoryView.h dd276275934c9f0737d6076a745656efa9e1a9e3 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef INVENTORY_VIEW_H ============================================================ --- src/view/InventoryViewDelegate.cpp 85121a85ccab754b400fc5a33be1c007ba243f02 +++ src/view/InventoryViewDelegate.cpp 7f98ffbb697062e56bd3dc304129aa698d87b58b @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "InventoryViewDelegate.h" ============================================================ --- src/view/InventoryViewDelegate.h 7b67edf5a5cfa2460c972592b1dccbfb08777329 +++ src/view/InventoryViewDelegate.h bb14c373a2f671e55237ed612fb01cdf80591111 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef INVENTORY_VIEW_DELEGATE_H ============================================================ --- src/view/MainWindow.cpp 9234140581c324011828a21086196827bbda2605 +++ src/view/MainWindow.cpp 97f3476a31a453cffbe0ad2d28252ab797547b99 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "MainWindow.h" ============================================================ --- src/view/MainWindow.h aec45dc484db45f56d74532941abe658e385d6f5 +++ src/view/MainWindow.h 9a06be9e8a5b42f070623f2be8e753e36d9d4190 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef MAINWINDOW_H ============================================================ --- src/view/MenuBar.cpp bc48b2de266b56168282dc8b262630393bdef4dd +++ src/view/MenuBar.cpp 534210bc90eebe4eee2b468402ce595406901a74 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "MenuBar.h" ============================================================ --- src/view/MenuBar.h e36f45a2a082967672a019d83431d8a6c0c8f8dd +++ src/view/MenuBar.h 3c15ed81f367bad013dfeb2cdd6b5aa24102db2f @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef MENU_BAR_H ============================================================ --- src/view/Splitter.cpp d5312983d3d4021820ea6c9a2d5fb6bc772ec0a1 +++ src/view/Splitter.cpp 1439b2d0ff0bbfaba191d918313b2c01b054561a @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Splitter.h" ============================================================ --- src/view/Splitter.h d5bc3e8758fe387b2f3e6b725894cef55edf7f11 +++ src/view/Splitter.h e442f84910e71139c1dccd28ff8123cf21e57f67 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef SPLITTER_H ============================================================ --- src/view/TreeView.cpp 108452f506d6ee67ef88aa4fb153863aa39f424d +++ src/view/TreeView.cpp dcf826574e06d65e22db5a586caeb918673c00d0 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "TreeView.h" ============================================================ --- src/view/TreeView.h e03e26c64090622a9c2355d1e443e3e77e53c112 +++ src/view/TreeView.h 7b872f64c09770fed7e6cf2dd321b6a798a05f90 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef TREE_VIEW_H ============================================================ --- src/view/WorkspaceFloater.cpp 676690f16b4a3f3286ae79208936dd8859b65090 +++ src/view/WorkspaceFloater.cpp 94bd8527ee23c8b4b77f10bf6dfb97b23a702818 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "WorkspaceFloater.h" ============================================================ --- src/view/WorkspaceFloater.h 645db5d659f260ab6b10611a7df5d2424bffe2f9 +++ src/view/WorkspaceFloater.h 7096d08765272d1ddbbda305c01ba1adc0b80a7e @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef WORKSPACE_FLOATER_H ============================================================ --- src/view/WorkspaceMenuBar.cpp 411ab43b97d6437785a9cea40c9aa45cae30eb2b +++ src/view/WorkspaceMenuBar.cpp 9b53a8a4b55576cd48adda8634cbd85b5da35d89 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "WorkspaceMenuBar.h" ============================================================ --- src/view/WorkspaceMenuBar.h 11e5106fd77b83b3bbb9a5f5d970e0709c53a2db +++ src/view/WorkspaceMenuBar.h 42a61673b49017a92bc108f2dcf46bcd8a4c5e49 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef WORKSPACE_MENU_BAR_H ============================================================ --- src/view/WorkspaceWindow.cpp 2af2e9a9dac69191b72ea1ff6c67aa5ca8359016 +++ src/view/WorkspaceWindow.cpp a57527afe8592e57cc8c5deb5d0d1f927b81aa5d @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "WorkspaceWindow.h" ============================================================ --- src/view/WorkspaceWindow.h ccc33495e5dbe966045065fb35311d07f5f7e96e +++ src/view/WorkspaceWindow.h ee9feb6b5087706cc2b84f2cafbebcd241d15f0b @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef WORKSPACEWINDOW_H ============================================================ --- src/view/dialogs/About.cpp 56849dd96a26feb6b715a44be632dd34944e1b52 +++ src/view/dialogs/About.cpp 94f8bd7362fd5d391682e5b4f81525547c1db295 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "About.h" @@ -34,7 +32,7 @@ About::About(QWidget * parent) : Dialog( "Jean-Louis Fuchs" "

This program is free software; you can redistribute it and/or modify
" "it under the terms of the GNU General Public License as published by
" - "the Free Software Foundation; either version 2 of the License, or
" + "the Free Software Foundation, either version 3 of the License, or
" "(at your option) any later version." "

Bugs? Suggestions? Help? " "guitone Homepage" ============================================================ --- src/view/dialogs/About.h a9e9e206ccab9eaf927f806ae847359530c87a25 +++ src/view/dialogs/About.h eeeef54f2ffa3bce962b1d9b183dcc4a157b6a67 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef ABOUT_H ============================================================ --- src/view/dialogs/AddEditAttribute.cpp 1f9555c4103d227d66191031fea7b1e9d41462e7 +++ src/view/dialogs/AddEditAttribute.cpp fe5146b5ad9022345783e70cba000ab6ffc8cef4 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "AddEditAttribute.h" @@ -26,19 +24,19 @@ AddEditAttribute::AddEditAttribute( { setupUi(this); Dialog::init(); - + // these are added here and not in designer to prevent their // automatic localization through uic attrKey->insertItem(0, "mtn:execute"); attrKey->insertItem(1, "mtn:manual_merge"); - + int keyPos = attrKey->findText(key); if (keyPos == -1) { attrKey->insertItem(0, key); keyPos = 0; } - + attrKey->setCurrentIndex(keyPos); attrValue->setText(value); } ============================================================ --- src/view/dialogs/AddEditAttribute.h aea71c7ba22359058eaccfc8be8d112dd79bf231 +++ src/view/dialogs/AddEditAttribute.h efd7bdf982aa2c9761083b1e0d4dfe03300d3da0 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef ADDEDITATTRIBUTE_H @@ -27,12 +25,12 @@ class AddEditAttribute : public Dialog, class AddEditAttribute : public Dialog, private Ui::AddEditAttributeDialog { - Q_OBJECT + Q_OBJECT public: - AddEditAttribute(QWidget *, + AddEditAttribute(QWidget *, const QString & key = QString(), const QString & value = QString()); - ~AddEditAttribute(); + ~AddEditAttribute(); QString getKey() const { return attrKey->currentText(); } QString getValue() const { return attrValue->text(); } }; ============================================================ --- src/view/dialogs/ApplicationUpdate.cpp c0b3ef7d07d9095db4f36229c76e3e523b74bffe +++ src/view/dialogs/ApplicationUpdate.cpp 1877bdbdb1b60402d2b30335a9312c1a7b9dfbec @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "ApplicationUpdate.h" ============================================================ --- src/view/dialogs/ApplicationUpdate.h f98ed4f83d1a3bf7e3455cd1ae644b16d9fd417d +++ src/view/dialogs/ApplicationUpdate.h 15d58d7ed4e847db2d4669c24fbe4bd894786722 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef APPLICATION_UPDATE_H ============================================================ --- src/view/dialogs/ChangesetBrowser.cpp 2f4e311cfeb2a54fcd3d843919802ffcea4972fd +++ src/view/dialogs/ChangesetBrowser.cpp 7281ea4d20f313f0383c2fcf41c9e748427f9ad2 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "ChangesetBrowser.h" ============================================================ --- src/view/dialogs/ChangesetBrowser.h 762d08a1a37e466eaa18c31515fed98bee874398 +++ src/view/dialogs/ChangesetBrowser.h 5fee47bec4ac82fe7a5ea7a091160fe02c423f3e @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Jean-Louis Fuchs * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef CHANGESET_BROWSER_H ============================================================ --- src/view/dialogs/CheckoutRevision.cpp de2e69f03edb0666452374c0a97a80d50ea8e987 +++ src/view/dialogs/CheckoutRevision.cpp e87e47226ce4c690d8d1019d034ea60c85f92763 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "CheckoutRevision.h" ============================================================ --- src/view/dialogs/CheckoutRevision.h 519d02c75386f8576a23484cc59bc8b6bc87004d +++ src/view/dialogs/CheckoutRevision.h 643632486232552a5647b6229826ecffae77aa81 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef CHECKOUT_REVISION_H ============================================================ --- src/view/dialogs/CommitRevision.cpp 46aa99721df59476868e9b0268854f01a9729259 +++ src/view/dialogs/CommitRevision.cpp 9c06833957c547802f3c3a0873ed10640f2537a1 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "CommitRevision.h" ============================================================ --- src/view/dialogs/CommitRevision.h 1d143af306b3bc2d2dc6a714fc4e760f393ccb28 +++ src/view/dialogs/CommitRevision.h fdc575faa9b56117ee49625e3b70242b180ecb9f @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef COMMIT_REVISION_H ============================================================ --- src/view/dialogs/DatabaseDialogManager.cpp 0682dfa8ded86ab14e4b0ec82ba796ef516b2c60 +++ src/view/dialogs/DatabaseDialogManager.cpp bd233a55cd97ce0a3d96f4fd8a89408b63d600dd @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "DatabaseDialogManager.h" ============================================================ --- src/view/dialogs/DatabaseDialogManager.h 4a760e7161b0fa7d80f42cd072697d68b9fc7ab6 +++ src/view/dialogs/DatabaseDialogManager.h 0634ee9c6523ae5cf8df8ff7b3a6efa38163dde1 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef DATABASE_DIALOG_MANAGER_H ============================================================ --- src/view/dialogs/Dialog.cpp 7c1dd6b8d0a48131d275bef34bcf5a9f562b6283 +++ src/view/dialogs/Dialog.cpp 9cd98e1445614adc0bb33b4ed5bf8858b705400c @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Dialog.h" ============================================================ --- src/view/dialogs/Dialog.h 99c69a70477eb8ae638eed80a94766385f28667a +++ src/view/dialogs/Dialog.h 4e6ee1ac9f09821bd37f888f8aaabb12663a6a5b @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef DIALOG_H ============================================================ --- src/view/dialogs/DialogManager.cpp 109413ef4db839312f5084c1bc5e0b2cdd4093b1 +++ src/view/dialogs/DialogManager.cpp 567fbd5fdfec301a8a4d048a030395825f173266 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "DialogManager.h" ============================================================ --- src/view/dialogs/DialogManager.h 0a0c6eab2209d8a96f277d922231e469a0521aa2 +++ src/view/dialogs/DialogManager.h bc1e7578538c2981d6b2ba995e18c13b23b17d65 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef DIALOGMANAGER_H ============================================================ --- src/view/dialogs/FileDiff.cpp 3ca14f49640303a7a64cb0def33be2a4a1a519be +++ src/view/dialogs/FileDiff.cpp 1f8c9243580e4617bf3a9887cbb0ec0cbc78a225 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "FileDiff.h" ============================================================ --- src/view/dialogs/FileDiff.h 94a31f0695e5ab4097ec6f32d4a71ac6e5f83348 +++ src/view/dialogs/FileDiff.h ba57120aa6697586ec041e4dbb6175927cc49861 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef FILE_DIFF_H ============================================================ --- src/view/dialogs/FileHistory.cpp 204d49ef1ffcd08420370989ccec8a32b442d16c +++ src/view/dialogs/FileHistory.cpp 57e211a968aec67716db2f91d43d9c64c6299865 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "FileHistory.h" ============================================================ --- src/view/dialogs/FileHistory.h eb768f1271107bf134a815d8fd1481de89a147ee +++ src/view/dialogs/FileHistory.h d543deea2159e969268866f3626cedfc441f84b3 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef FILE_HISTORY_H ============================================================ --- src/view/dialogs/GenerateKeypair.cpp 95a0048f05748ce4027fa0fdefb72516e516b25e +++ src/view/dialogs/GenerateKeypair.cpp 6ed24f6d1bcee46cd89605ecbe0c3c5a6b17475c @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "GenerateKeypair.h" ============================================================ --- src/view/dialogs/GenerateKeypair.h 281a4381ce6b78b6e250ea9a75de4220904ffba4 +++ src/view/dialogs/GenerateKeypair.h 7c03b44f2a4ab18dc5125a5f59474f356f84a00d @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef GENERATEKEYPAIR_H ============================================================ --- src/view/dialogs/KeyManagement.cpp c8f50b35dc4da3073521bcb2695cc600698edf7c +++ src/view/dialogs/KeyManagement.cpp 7a7746b6f8945ae315ccb6162dbbc1af6febcbb2 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "KeyManagement.h" ============================================================ --- src/view/dialogs/KeyManagement.h f9121cb1b7b400b9b5fd2da1d30fcc1f4d669fa4 +++ src/view/dialogs/KeyManagement.h 89f6ca59ea789e2c4a3cbd3ee0812c07c2c179aa @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Ingo Maindorfer * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef KEYMANAGEMENT_H ============================================================ --- src/view/dialogs/OpenPrompt.cpp 0398da0a68a5c3302d91b6232189abedce01c8ee +++ src/view/dialogs/OpenPrompt.cpp cb2a6c25e78678efb597a83d1f6fb42d635fcd14 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "OpenPrompt.h" ============================================================ --- src/view/dialogs/OpenPrompt.h 09ca822351519c6c01d079b3aaaaf5a43f3963a3 +++ src/view/dialogs/OpenPrompt.h 8cdfb40d1faaa80d3d366f83ed9bd6019212dda2 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef OPEN_PROMPT_H ============================================================ --- src/view/dialogs/Preferences.cpp 62c7d6fe31de9db358bff248db6a939786347670 +++ src/view/dialogs/Preferences.cpp d1f74302d4a191be707d1011732c3fbd2ce131a1 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "Preferences.h" ============================================================ --- src/view/dialogs/Preferences.h 158ed167709f8220efc4d958319c8a60da2eaa45 +++ src/view/dialogs/Preferences.h 0e794e935acc480185792cfd839e5e445a0d1d16 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef PREFERENCES_H ============================================================ --- src/view/dialogs/RevisionDiff.cpp 1361bc56009d31b862f27759fae0d02a36c0d78b +++ src/view/dialogs/RevisionDiff.cpp c03a05117e11c00a098e0fd55b09385dc7cb205c @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "RevisionDiff.h" ============================================================ --- src/view/dialogs/RevisionDiff.h 8f6e3ad38608c0c958525a95b42e4998c29876ea +++ src/view/dialogs/RevisionDiff.h e536991efd9001e62a385f86c7130ea26b2cbee7 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef REVISION_DIFF_H ============================================================ --- src/view/dialogs/RevisionManifest.cpp 4965902b6ef1e583149e4ec1a76bca7db4cddaf5 +++ src/view/dialogs/RevisionManifest.cpp 2d81703aa99b208169d84eb9573bc262c8019ae0 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "RevisionManifest.h" ============================================================ --- src/view/dialogs/RevisionManifest.h 8ac1d3278d8818c5dae1d245e9062fa40bd9ddd1 +++ src/view/dialogs/RevisionManifest.h 9dba97aea72178322d909583bb5ce92b3a5dd116 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef REVISION_MANIFEST_H ============================================================ --- src/view/dialogs/SelectRevision.cpp 86df3a95f7b536d6742f90cfa711fbad5f26d488 +++ src/view/dialogs/SelectRevision.cpp 59edae38fa0c050495462308b2c279224a7f9357 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "SelectRevision.h" ============================================================ --- src/view/dialogs/SelectRevision.h f1cfe5155117d125ded2e64917bf2263b425c263 +++ src/view/dialogs/SelectRevision.h b9d7c86fcc38c8e035a24a251d6cc922ae7a717e @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2006 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef SELECT_REVISION_H ============================================================ --- src/view/dialogs/UnaccountedRenames.cpp 4ff91392b7562f86f5b07d4c90fe751727dc57a5 +++ src/view/dialogs/UnaccountedRenames.cpp 25d128e8323df0b45c5b81168a5f2e5a38611e2f @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "UnaccountedRenames.h" ============================================================ --- src/view/dialogs/UnaccountedRenames.h 8d45c36f953a2e7de5605f04bdd3bac9b6a282ff +++ src/view/dialogs/UnaccountedRenames.h 5289ad6e72401ed91ec2494aee91b99dcd892b1c @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef UNACCOUNTED_RENAMES_H ============================================================ --- src/view/dialogs/UpdateWorkspace.cpp 45eb6677d65feb3c3bbdf697ea88c5566ec36c02 +++ src/view/dialogs/UpdateWorkspace.cpp fc8e3ff3f490dffea8fd906bfdc4f014756906f7 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "UpdateWorkspace.h" ============================================================ --- src/view/dialogs/UpdateWorkspace.h 6765da7bd5234328ac89863f69cb23fcb4bcb6e3 +++ src/view/dialogs/UpdateWorkspace.h d51f6698c1e9b13c89b660fff1dd0944e5095365 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef UPDATE_WORKSPACE_H ============================================================ --- src/view/dialogs/WorkspaceDialogManager.cpp 052fef6ee22f29c32c391a7ba659852f78328496 +++ src/view/dialogs/WorkspaceDialogManager.cpp dd484a907c3f11a9c073fc3fcd7e2778360ee831 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #include "WorkspaceDialogManager.h" ============================================================ --- src/view/dialogs/WorkspaceDialogManager.h 83005973338a03cde630f2dea7a4115d21bb20a6 +++ src/view/dialogs/WorkspaceDialogManager.h e874a262a700fda55d233642fecb0f7d59ce0240 @@ -1,10 +1,10 @@ /*************************************************************************** * Copyright (C) 2007 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation, either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifndef WORKSPACE_DIALOG_MANAGER_H