Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1155] dcplusplus/trunk
|
From: <arn...@us...> - 2008-04-14 20:28:46
|
Revision: 1155
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1155&view=rev
Author: arnetheduck
Date: 2008-04-14 13:28:35 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
rename smartutil, move tstring to core
Modified Paths:
--------------
dcplusplus/trunk/dwt/include/dwt/Application.h
dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h
dcplusplus/trunk/dwt/include/dwt/ClipBoard.h
dcplusplus/trunk/dwt/include/dwt/CommandLine.h
dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h
dcplusplus/trunk/dwt/include/dwt/Resource.h
dcplusplus/trunk/dwt/include/dwt/Widget.h
dcplusplus/trunk/dwt/include/dwt/WindowClass.h
dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h
dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h
dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h
dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h
dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h
dcplusplus/trunk/dwt/include/dwt/dwt.hpp
dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h
dcplusplus/trunk/dwt/include/dwt/resources/Font.h
dcplusplus/trunk/dwt/include/dwt/resources/Icon.h
dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h
dcplusplus/trunk/dwt/include/dwt/util/DateTime.h
dcplusplus/trunk/dwt/include/dwt/util/RegKey.h
dcplusplus/trunk/dwt/include/dwt/util/StringConversion.h
dcplusplus/trunk/dwt/include/dwt/util/StringUtils.h
dcplusplus/trunk/dwt/include/dwt/util/TimeSpan.h
dcplusplus/trunk/dwt/include/dwt/util/xCeptionSmartUtilities.h
dcplusplus/trunk/dwt/include/dwt/widgets/Button.h
dcplusplus/trunk/dwt/include/dwt/widgets/CheckBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/ComboBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/Composite.h
dcplusplus/trunk/dwt/include/dwt/widgets/Container.h
dcplusplus/trunk/dwt/include/dwt/widgets/Control.h
dcplusplus/trunk/dwt/include/dwt/widgets/CoolBar.h
dcplusplus/trunk/dwt/include/dwt/widgets/DateTime.h
dcplusplus/trunk/dwt/include/dwt/widgets/FolderDialog.h
dcplusplus/trunk/dwt/include/dwt/widgets/Frame.h
dcplusplus/trunk/dwt/include/dwt/widgets/GroupBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/Label.h
dcplusplus/trunk/dwt/include/dwt/widgets/LoadDialog.h
dcplusplus/trunk/dwt/include/dwt/widgets/MDIChild.h
dcplusplus/trunk/dwt/include/dwt/widgets/MDIFrame.h
dcplusplus/trunk/dwt/include/dwt/widgets/MessageBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/RadioButton.h
dcplusplus/trunk/dwt/include/dwt/widgets/SaveDialog.h
dcplusplus/trunk/dwt/include/dwt/widgets/StatusBar.h
dcplusplus/trunk/dwt/include/dwt/widgets/TabSheet.h
dcplusplus/trunk/dwt/include/dwt/widgets/TabView.h
dcplusplus/trunk/dwt/include/dwt/widgets/Table.h
dcplusplus/trunk/dwt/include/dwt/widgets/TextBox.h
dcplusplus/trunk/dwt/include/dwt/widgets/ToolBar.h
dcplusplus/trunk/dwt/include/dwt/widgets/ToolTip.h
dcplusplus/trunk/dwt/include/dwt/widgets/Tree.h
dcplusplus/trunk/dwt/include/dwt/widgets/WidgetMenu.h
dcplusplus/trunk/dwt/include/dwt/widgets/Window.h
dcplusplus/trunk/dwt/include/dwt/xCeption.h
dcplusplus/trunk/dwt/src/Application.cpp
dcplusplus/trunk/dwt/src/Bitmap.cpp
dcplusplus/trunk/dwt/src/CanvasClasses.cpp
dcplusplus/trunk/dwt/src/CommandLine.cpp
dcplusplus/trunk/dwt/src/Font.cpp
dcplusplus/trunk/dwt/src/Icon.cpp
dcplusplus/trunk/dwt/src/LibraryLoader.cpp
dcplusplus/trunk/dwt/src/Resource.cpp
dcplusplus/trunk/dwt/src/WindowClass.cpp
dcplusplus/trunk/dwt/src/util/DateTime.cpp
dcplusplus/trunk/dwt/src/util/RegKey.cpp
dcplusplus/trunk/dwt/src/util/StringUtils.cpp
dcplusplus/trunk/dwt/src/util/TimeSpan.cpp
dcplusplus/trunk/dwt/src/widgets/Button.cpp
dcplusplus/trunk/dwt/src/widgets/CheckBox.cpp
dcplusplus/trunk/dwt/src/widgets/ComboBox.cpp
dcplusplus/trunk/dwt/src/widgets/CoolBar.cpp
dcplusplus/trunk/dwt/src/widgets/DateTime.cpp
dcplusplus/trunk/dwt/src/widgets/FolderDialog.cpp
dcplusplus/trunk/dwt/src/widgets/GroupBox.cpp
dcplusplus/trunk/dwt/src/widgets/Label.cpp
dcplusplus/trunk/dwt/src/widgets/LoadDialog.cpp
dcplusplus/trunk/dwt/src/widgets/MDIChild.cpp
dcplusplus/trunk/dwt/src/widgets/MDIFrame.cpp
dcplusplus/trunk/dwt/src/widgets/RadioButton.cpp
dcplusplus/trunk/dwt/src/widgets/SaveDialog.cpp
dcplusplus/trunk/dwt/src/widgets/TabSheet.cpp
dcplusplus/trunk/dwt/src/widgets/TabView.cpp
dcplusplus/trunk/dwt/src/widgets/Table.cpp
dcplusplus/trunk/dwt/src/widgets/TextBox.cpp
dcplusplus/trunk/dwt/src/widgets/ToolBar.cpp
dcplusplus/trunk/dwt/src/widgets/Tree.cpp
dcplusplus/trunk/dwt/src/widgets/WidgetMenu.cpp
dcplusplus/trunk/dwt/src/widgets/Window.cpp
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/MainWindow.h
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/TextBox.cpp
dcplusplus/trunk/win32/TextBox.h
Added Paths:
-----------
dcplusplus/trunk/dwt/include/dwt/tstring.h
dcplusplus/trunk/dwt/include/dwt/util/tstream.h
Removed Paths:
-------------
dcplusplus/trunk/dwt/include/dwt/util/ChooseWideNarrowChar.h
dcplusplus/trunk/dwt/include/dwt/util/tstring.h
dcplusplus/trunk/dwt/src/util/tstring.cpp
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-04-11 09:47:30.551000118 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-04-11 11:07:24.957000017 +0200
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
Name: bzr:file-ids
- dwt/src/widgets/StatusBar.cpp statusbar.cpp-20080411074555-dsjf6pam1593f02o-1
+ dwt/include/dwt/tstring.h 712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2FSmartUtil%2Ftstring.h
dwt/include/dwt/util/tstream.h tstream.h-20080411080221-6gcjog2gf271jxh3-1
Name: bzr:revision-id:v3-trunk1
- 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn
1029 zouzou123gen-20080323221249-0su72zaj13e706mk
1030 arn...@gm...-20080324140623-muba1dl46m000o8c
1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6
1032 arn...@gm...-20080324153706-siidja05n84i00b1
1033 arn...@gm...-20080324153823-lhn3awurnu77riln
1034 arn...@gm...-20080324165650-zapppziji67yf5a2
1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2
1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3
1037 arn...@gm...-20080325100659-8fqy6q65itmghlep
1038 zouzou123gen-20080325175216-s297sdiucukfvijh
1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087
1040 arn...@gm...-20080325211747-nwwy1eb33r071sca
1041 arn...@gm...-20080326084110-qbselrjckku275xi
1042 zouzou123gen-20080326123631-35642mgbk2i4ty32
1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r
1044 arn...@gm...-20080326162031-il0nyms30w0mky43
1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv
1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g
1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv
1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q
1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz
1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf
1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd
1052 arn...@gm...-20080327120639-um3tukdt374rwvgm
1053 zouzou123gen-20080327130703-6vtek6uxy3vua543
1054 arn...@gm...-20080327215831-dmg5mkufskabwkro
1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf
1056 arn...@gm...-20080328085925-gceybsr53oml1p24
1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a
1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o
1059 arn...@gm...-20080329055630-braiir1dskv7a4qm
1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja
1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl
1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0
1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd
1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp
1065 arn...@gm...-20080329124926-2je1z18p0272zpua
1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp
1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r
1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5
1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql
1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q
1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux
1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd
1073 zouzou123gen-20080331124549-alyw7vugdn30piqy
1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm
1075 zouzou123gen-20080331140757-u94q52yccl5lsifk
1076 zouzou123gen-20080331152513-ue1x5qhigcw51348
1077 arn...@gm...-20080331184436-a8g6chibmg8nswls
1078 arn...@gm...-20080331220648-81485k28qmwruwz6
1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a
1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw
1081 zouzou123gen-20080401084117-24a454g8o0x656kg
1082 zouzou123gen-20080401133146-jabb5i8870fg6f66
1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6
1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f
1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk
1086 arn...@gm...-20080402084515-ofmnwihzv159jton
1087 arn...@gm...-20080402133105-y70soi38owzl76i9
1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae
1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0
1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8
1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh
1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5
1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h
1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46
1095 arn...@gm...-20080402193851-6mu64vgep6tijith
1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r
1097 arn...@gm...-20080402204331-so2e8n892o23pejr
1098 poy-20080402224153-225qylr2cfwhqrg7
1099 mrmikejj-20080403125112-o8polh8rkn62umyh
1100 arn...@gm...-20080403125139-8xub76j1xazhfxna
1101 po...@12...-20080403140544-13kockkjho883nb4
1102 po...@12...-20080403143012-bxghtoodiolugpbs
1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20
1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws
1105 arn...@gm...-20080403213124-54spdrwszgyimd90
1106 po...@12...-20080404002406-aj74x5tngi6mmmj1
1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra
1108 po...@12...-20080404145445-84lyk5tyy3b3br14
1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc
1110 po...@12...-20080405001107-14d1ojjof8xhvcj8
1111 arn...@gm...-20080405071929-jmnrul21sxx04kky
1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai
1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf
1114 po...@12...-20080405220250-8y09d0samsj8ja94
1115 po...@12...-20080406134101-4860ytb61sbu3yhg
1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g
1117 po...@12...-20080406164835-bv5dydhm3qqydsty
1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044
1119 po...@12...-20080407114423-4yajg1rffidq76bj
1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn
1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9
1122 po...@12...-20080407220647-r7f3em92til5j67s
1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc
1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3
1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz
1126 po...@12...-20080409215055-1zmqhhm2859878c1
1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc
1128 arn...@gm...-20080410214118-b70g50tl27cq9q29
1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3
+ 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn
1029 zouzou123gen-20080323221249-0su72zaj13e706mk
1030 arn...@gm...-20080324140623-muba1dl46m000o8c
1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6
1032 arn...@gm...-20080324153706-siidja05n84i00b1
1033 arn...@gm...-20080324153823-lhn3awurnu77riln
1034 arn...@gm...-20080324165650-zapppziji67yf5a2
1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2
1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3
1037 arn...@gm...-20080325100659-8fqy6q65itmghlep
1038 zouzou123gen-20080325175216-s297sdiucukfvijh
1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087
1040 arn...@gm...-20080325211747-nwwy1eb33r071sca
1041 arn...@gm...-20080326084110-qbselrjckku275xi
1042 zouzou123gen-20080326123631-35642mgbk2i4ty32
1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r
1044 arn...@gm...-20080326162031-il0nyms30w0mky43
1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv
1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g
1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv
1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q
1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz
1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf
1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd
1052 arn...@gm...-20080327120639-um3tukdt374rwvgm
1053 zouzou123gen-20080327130703-6vtek6uxy3vua543
1054 arn...@gm...-20080327215831-dmg5mkufskabwkro
1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf
1056 arn...@gm...-20080328085925-gceybsr53oml1p24
1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a
1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o
1059 arn...@gm...-20080329055630-braiir1dskv7a4qm
1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja
1061 arn...@gm...-20080329081253-if6o5jn329mbzfpl
1062 arn...@gm...-20080329081619-cb4x930j8sp55cs0
1063 arn...@gm...-20080329103216-hgjzo7ra2zixbztd
1064 arn...@gm...-20080329124042-q3aw4iodmo5kafyp
1065 arn...@gm...-20080329124926-2je1z18p0272zpua
1066 arn...@gm...-20080329150901-ehj9t32en7eps2dp
1067 zouzou123gen-20080329153653-36xlvpik2ns9r84r
1068 zouzou123gen-20080329162703-51xr8hg073pg7wq5
1069 zouzou123gen-20080329234706-8ddipdqu0xeudkql
1070 arn...@gm...-20080330081232-ubqr1171ewalrd4q
1071 zouzou123gen-20080330131607-yppbs3mgyjef1cux
1072 zouzou123gen-20080330134835-yv1nogy77ib1uehd
1073 zouzou123gen-20080331124549-alyw7vugdn30piqy
1074 zouzou123gen-20080331135108-q8frtqsin5bosfzm
1075 zouzou123gen-20080331140757-u94q52yccl5lsifk
1076 zouzou123gen-20080331152513-ue1x5qhigcw51348
1077 arn...@gm...-20080331184436-a8g6chibmg8nswls
1078 arn...@gm...-20080331220648-81485k28qmwruwz6
1079 zouzou123gen-20080401081001-2yjn07cf8s5sxr3a
1080 zouzou123gen-20080401081247-f3p4hdjojnd460jw
1081 zouzou123gen-20080401084117-24a454g8o0x656kg
1082 zouzou123gen-20080401133146-jabb5i8870fg6f66
1083 zouzou123gen-20080401154610-mxdqoo5bksru93e6
1084 arn...@gm...-20080401185530-lqj4tflt5ldmx46f
1085 arn...@gm...-20080401212616-ffl7m0xm8gt15knk
1086 arn...@gm...-20080402084515-ofmnwihzv159jton
1087 arn...@gm...-20080402133105-y70soi38owzl76i9
1088 arn...@gm...-20080402142417-rn2dbkx19wfz3vae
1089 arn...@gm...-20080402144459-u3z3hqvl8aqjc4a0
1090 zouzou123gen-20080402145051-zi8tmvy8u3r2mzu8
1091 arn...@gm...-20080402152137-f397uz1yp9qjvfwh
1092 zouzou123gen-20080402170355-29wda40wk3cy7lu5
1093 arn...@gm...-20080402180628-ipos9li0c4bsmq1h
1094 arn...@gm...-20080402181235-s2a6f4ww4lzayl46
1095 arn...@gm...-20080402193851-6mu64vgep6tijith
1096 arn...@gm...-20080402203810-86zpxsx69q83zf3r
1097 arn...@gm...-20080402204331-so2e8n892o23pejr
1098 poy-20080402224153-225qylr2cfwhqrg7
1099 mrmikejj-20080403125112-o8polh8rkn62umyh
1100 arn...@gm...-20080403125139-8xub76j1xazhfxna
1101 po...@12...-20080403140544-13kockkjho883nb4
1102 po...@12...-20080403143012-bxghtoodiolugpbs
1103 arn...@gm...-20080403190809-bbi4bz5rfcvjnt20
1104 arn...@gm...-20080403205410-czxru1vcg1s4wcws
1105 arn...@gm...-20080403213124-54spdrwszgyimd90
1106 po...@12...-20080404002406-aj74x5tngi6mmmj1
1107 arn...@gm...-20080404122415-mjy07qzbaxyhagra
1108 po...@12...-20080404145445-84lyk5tyy3b3br14
1109 po...@12...-20080404231417-v4v8x7u3f0hm0ejc
1110 po...@12...-20080405001107-14d1ojjof8xhvcj8
1111 arn...@gm...-20080405071929-jmnrul21sxx04kky
1112 arn...@gm...-20080405080105-9qbda7be0pi7y1ai
1113 po...@12...-20080405154555-yuj2n5kyndfjlpsf
1114 po...@12...-20080405220250-8y09d0samsj8ja94
1115 po...@12...-20080406134101-4860ytb61sbu3yhg
1116 po...@12...-20080406155849-2wzxzuzs5m8zpk0g
1117 po...@12...-20080406164835-bv5dydhm3qqydsty
1118 arn...@gm...-20080406210237-c7tyfgiz2sjgv044
1119 po...@12...-20080407114423-4yajg1rffidq76bj
1120 arn...@gm...-20080407194826-c42t4bjzw4vflejn
1121 po...@12...-20080407214303-o7ul1bvcn6gvaoc9
1122 po...@12...-20080407220647-r7f3em92til5j67s
1123 po...@12...-20080408212439-54t3bqlhvw1nu4xc
1124 arn...@gm...-20080409193708-y6erfzwrcb1seet3
1125 arn...@gm...-20080409195827-ub6t2s3wdf28nfpz
1126 po...@12...-20080409215055-1zmqhhm2859878c1
1127 arn...@gm...-20080410102447-l4es4cbukkqwcnpc
1128 arn...@gm...-20080410214118-b70g50tl27cq9q29
1129 arn...@gm...-20080411074730-w1pu78qigtx87lx3
1130 arn...@gm...-20080411090724-kwdj9pg9hrv1xhwb
Modified: dcplusplus/trunk/dwt/include/dwt/Application.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/Application.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -37,7 +37,7 @@
#define DWT_Application_h
#include "WindowsHeaders.h"
-#include "util/tstring.h"
+#include "tstring.h"
#include "CommandLine.h"
#include "ApplicationPlatform.h"
#include "xCeption.h"
@@ -118,7 +118,7 @@
* If you want to have the path AND the FILENAME of the image process you must
* use Application::getModuleFileName.
*/
- SmartUtil::tstring getModulePath() const;
+ tstring getModulePath() const;
/// Returns the full filename to the process
/** NOTE! <br>
@@ -126,7 +126,7 @@
* image name. <br>
* If you want to have only the path you must use Application::getModulePath.
*/
- SmartUtil::tstring getModuleFileName() const;
+ tstring getModuleFileName() const;
typedef std::tr1::function<bool (MSG&)> FilterFunction;
// List becuse its iterators aren't invalidated on add/delete...
Modified: dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/CanvasClasses.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -443,13 +443,13 @@
* </ul>
* Google for or look at MSDN what their different meaning are.
*/
- int drawText( const SmartUtil::tstring & text, const dwt::Rectangle & rect, unsigned format );
+ int drawText( const tstring & text, const dwt::Rectangle & rect, unsigned format );
/// Draws given text inside given Rectangle
/** Draw text within coordinates of given Rectangle according to <br>
* setTextColor, setTextAlign, SetTextJustification
*/
- void extTextOut( const SmartUtil::tstring & text, unsigned x, unsigned y );
+ void extTextOut( const tstring & text, unsigned x, unsigned y );
/// Sets the TextColor of the this Canvas.
/** Sets the TextColor for future TextOut() calls. Returns the previous color.
Modified: dcplusplus/trunk/dwt/include/dwt/ClipBoard.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/ClipBoard.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/ClipBoard.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -37,7 +37,7 @@
#define DWT_ClipBoard_h
#include "WindowsHeaders.h"
-#include "util/tstring.h"
+#include "tstring.h"
namespace dwt {
@@ -86,9 +86,9 @@
ClipBoard();
};
-/// Class for manipulating the clipboard, specialized for SmartUtil::tstring
+/// Class for manipulating the clipboard, specialized for tstring
/// clipboard operations.
-/** At the moment SmartWin only supports SmartUtil::tstring clipboard operations.
+/** At the moment SmartWin only supports tstring clipboard operations.
* <br>
* More clipboard formats will be supported in later version. <br>
* Every clipboard class is a Singleton to make access easy. <br>
@@ -96,7 +96,7 @@
* later as the type you stuffed it in as!</b>
*/
template< >
-class ClipBoard< SmartUtil::tstring > : public ClipBoardBase
+class ClipBoard< tstring > : public ClipBoardBase
{
public:
/// Returns the actual instance of the object
@@ -114,13 +114,13 @@
/// Sets clipboard data to given string
/** Takes a "parent" window which will "own" the clipboard and a
- * SmartUtil::tstring which will be stuffed into the clipboard and made <br>
+ * tstring which will be stuffed into the clipboard and made <br>
* accessible for other applications as CF_TEXT or your own application. <br>
* Just remember that if you use this specialized instance of the clipboard
* class you must access the clipboard again (through getClipBoardData) <br>
- * through the same specialization (SmartUtil::tstring specialization).
+ * through the same specialization (tstring specialization).
*/
- void setClipBoardData( const SmartUtil::tstring & str, const Widget * owner )
+ void setClipBoardData( const tstring & str, const Widget * owner )
{
if ( !::OpenClipboard( owner->handle() ) )
throw dwt::xCeption( _T( "Couldn't open the clipboard" ) );
@@ -151,7 +151,7 @@
* if the clipboard is either empty or if the clipboard data was of the wrong
* format.
*/
- SmartUtil::tstring getClipBoardData( const Widget * owner ) const
+ tstring getClipBoardData( const Widget * owner ) const
{
if ( !::IsClipboardFormatAvailable( CF_TEXT ) )
return _T( "" );
@@ -160,7 +160,7 @@
HANDLE handle = ::GetClipboardData( CF_TEXT );
if ( 0 == handle )
return _T( "" );
- SmartUtil::tstring retVal( reinterpret_cast< TCHAR * >( GlobalLock( handle ) ) );
+ tstring retVal( reinterpret_cast< TCHAR * >( GlobalLock( handle ) ) );
GlobalUnlock( handle );
CloseClipboard();
return retVal;
@@ -179,7 +179,7 @@
/// \ingroup GlobalStuff
// For easy access of the most common ClipBoard specializations.
-typedef ClipBoard< SmartUtil::tstring > ClipBoardString;
+typedef ClipBoard< tstring > ClipBoardString;
}
Modified: dcplusplus/trunk/dwt/include/dwt/CommandLine.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/CommandLine.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/CommandLine.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -38,7 +38,7 @@
#include <boost/noncopyable.hpp>
#include <vector>
-#include "util/tstring.h"
+#include "tstring.h"
namespace dwt {
@@ -55,19 +55,19 @@
public:
/// Returns a vector of the actual params
/** The parameters are split using standard argv semantics */
- const std::vector< SmartUtil::tstring > & getParams() const;
+ const std::vector< tstring > & getParams() const;
/// Returns the "raw" command line parameter
/** For those of you which MUST have the actual RAW command line parameter you
* can use this function which will return them as given to the application.
*/
- const SmartUtil::tstring& getParamsRaw() const;
+ const tstring& getParamsRaw() const;
private:
// Only Application which is friend can instantiate an object of this type!!
CommandLine( ) { }
- mutable std::vector< SmartUtil::tstring > itsCmdLine;
- mutable SmartUtil::tstring itsRawCmdLine;
+ mutable std::vector< tstring > itsCmdLine;
+ mutable tstring itsRawCmdLine;
};
}
Modified: dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/LibraryLoader.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -37,7 +37,7 @@
#define DWT_LibraryLoader_h
#include "WindowsHeaders.h"
-#include "util/tstring.h"
+#include "tstring.h"
#include "Threads.h"
#include "xCeption.h"
#include <map>
@@ -81,7 +81,7 @@
* just allocate a static stack object of this type with the given library name
* anywhere you need to ensure your library must be loaded!
*/
- LibraryLoader( const SmartUtil::tstring & libraryName );
+ LibraryLoader( const tstring & libraryName );
/// Argument free Constructor
/** Argument free Constructor, does NOTHING call load to actually load library!
@@ -90,9 +90,9 @@
/// Actually loads library
/** Call this one to actually load the given library or use Constructor taking
- * SmartUtil::tstring argument which automatically loads library!
+ * tstring argument which automatically loads library!
*/
- void load( const SmartUtil::tstring & libraryName );
+ void load( const tstring & libraryName );
@@ -103,7 +103,7 @@
* FARPROC x1 = richEditLibrary.getProcAddress( _T("CreateTextServices") ); <br>
* FARPROC x2 = richEditLibrary.getProcAddress( 4 ); <br>
*/
- FARPROC getProcAddress( const SmartUtil::tstring & procedureName );
+ FARPROC getProcAddress( const tstring & procedureName );
/// Get procedure address from loaded library by ordinal value
/**
@@ -124,10 +124,10 @@
private:
LibraryLoader( const LibraryLoader & ); // DENY COPY
LibraryLoader & operator =( const LibraryLoader & ); // DENY ASSIGNMENT
- SmartUtil::tstring itsLibraryName;
+ tstring itsLibraryName;
HMODULE itsHMod;
static Utilities::CriticalSection itsCs;
- static std::map< SmartUtil::tstring, std::pair< int, HMODULE > > itsLibrariesLoaded;
+ static std::map< tstring, std::pair< int, HMODULE > > itsLibrariesLoaded;
bool hasCalledLoad;
};
Modified: dcplusplus/trunk/dwt/include/dwt/Resource.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/Resource.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/Resource.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -37,7 +37,7 @@
#define DWT_Resources_h
#include "WindowsHeaders.h"
-#include "util/tstring.h"
+#include "tstring.h"
namespace dwt {
@@ -52,9 +52,9 @@
/// Constructor taking path to a resource dll
/** Pass in the path to the DLL you wish to load resources from
*/
- explicit Resource(const SmartUtil::tstring & file);
+ explicit Resource(const tstring & file);
- SmartUtil::tstring operator[] ( unsigned key );
+ tstring operator[] ( unsigned key );
// DTOR freeing the instance handle
virtual ~Resource();
Modified: dcplusplus/trunk/dwt/include/dwt/Widget.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/Widget.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/Widget.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -40,7 +40,7 @@
#include "Atom.h"
#include "Rectangle.h"
#include "Message.h"
-#include "util/tstring.h"
+#include "tstring.h"
#include <boost/noncopyable.hpp>
#include <list>
@@ -150,7 +150,7 @@
* It is feed directly to CreateWindowEx, this means that it follows its
* conventions. In particular, the string "#num" has a special meaning.
*/
- SmartUtil::tstring caption;
+ tstring caption;
/// The style of the object (starts with WS_ or BS_ etc...)
/** WARNING: The creation of most of the controls require WS_CHILD to be set.
@@ -169,7 +169,7 @@
/// Constructor initializing all member variables to default values
Seed(LPCTSTR className_, DWORD style_ = WS_VISIBLE, DWORD exStyle_ = 0,
- const SmartUtil::tstring& caption_ = SmartUtil::tstring(),
+ const tstring& caption_ = tstring(),
const Rectangle& location_ = letTheSystemDecide, HMENU menuHandle_ = NULL)
: className(className_), caption(caption_), style( style_ ), exStyle( exStyle_ ), location( location_ ), menuHandle( menuHandle_ )
{}
Modified: dcplusplus/trunk/dwt/include/dwt/WindowClass.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/WindowClass.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/WindowClass.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -42,13 +42,13 @@
class WindowClass : boost::noncopyable {
public:
- WindowClass(const SmartUtil::tstring& className, WNDPROC wndProc, LPCTSTR menu = NULL, HBRUSH background = NULL, IconPtr icon = IconPtr(), IconPtr iconsm = IconPtr(), HCURSOR cursor = NULL);
+ WindowClass(const tstring& className, WNDPROC wndProc, LPCTSTR menu = NULL, HBRUSH background = NULL, IconPtr icon = IconPtr(), IconPtr iconsm = IconPtr(), HCURSOR cursor = NULL);
~WindowClass();
LPCTSTR getClassName() { return reinterpret_cast<LPCTSTR>(static_cast<size_t>(atom)); }
/// Generate a new unique window class name
- static SmartUtil::tstring getNewClassName(Widget* widget);
+ static tstring getNewClassName(Widget* widget);
private:
static int itsInstanceNo;
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectDialog.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -32,7 +32,7 @@
#ifndef DWT_ASPECTDIALOG_H_
#define DWT_ASPECTDIALOG_H_
-#include "../util/tstring.h"
+#include "../tstring.h"
#include "../WidgetCreator.h"
#include <type_traits>
@@ -49,7 +49,7 @@
return ::GetDlgItem(H(), id);
}
- void setItemText(int id, const SmartUtil::tstring& text) {
+ void setItemText(int id, const tstring& text) {
::SetDlgItemText(H(), id, text.c_str());
}
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectDragDrop.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -53,12 +53,12 @@
class AspectDragDrop
{
struct Dispatcher {
- typedef std::tr1::function<void (std::vector< SmartUtil::tstring>, Point )> F;
+ typedef std::tr1::function<void (std::vector< tstring>, Point )> F;
Dispatcher(const F& f_) : f(f_) { }
bool operator()(const MSG& msg, LRESULT& ret) {
- std::vector<SmartUtil::tstring> files;
+ std::vector<tstring> files;
Point pt;
HDROP handle = (HDROP)msg.wParam;
if (handle) {
@@ -91,8 +91,8 @@
*
* Example:
*
- * void DropFile(std::vector<SmartUtil::tstring> files, Point droppoint) {
- * SmartUtil::tstring path = files.at(0);
+ * void DropFile(std::vector<tstring> files, Point droppoint) {
+ * tstring path = files.at(0);
* setText(path);
* int x = droppoint.x;
* int y = droppoint.y;
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectFileFilter.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -37,7 +37,7 @@
#define DWT_AspectFileFilter_h
#include "../WindowsHeaders.h"
-#include "../util/tstring.h"
+#include "../tstring.h"
#include "../xCeption.h"
namespace dwt {
@@ -58,7 +58,7 @@
* "HTML Files" etc. filter is the actual filter to filter in files to show
* normally this would be e.g. "*.html".
*/
- WidgetType& addFilter( const SmartUtil::tstring & filterName, const SmartUtil::tstring & filter )
+ WidgetType& addFilter( const tstring & filterName, const tstring & filter )
{
itsFilter.insert( itsFilter.end(), filterName.begin(), filterName.end() );
itsFilter.push_back( '\0' );
@@ -82,7 +82,7 @@
return *static_cast<WidgetType*>(this);
}
- WidgetType& setDefaultExtension(const SmartUtil::tstring& defExt) {
+ WidgetType& setDefaultExtension(const tstring& defExt) {
itsDefExt = defExt;
return *static_cast<WidgetType*>(this);
}
@@ -99,7 +99,7 @@
/** If given your dialog will try to start in the given directory, otherwise it
* will use the working directory of the process.
*/
- WidgetType& setInitialDirectory( const SmartUtil::tstring& initialDir ) {
+ WidgetType& setInitialDirectory( const tstring& initialDir ) {
itsInitialDir = initialDir;
return *static_cast<WidgetType*>(this);
}
@@ -133,11 +133,11 @@
private:
unsigned int itsActiveFilter;
- SmartUtil::tstring itsInitialDir;
- SmartUtil::tstring itsFilter;
- SmartUtil::tstring itsDefExt;
+ tstring itsInitialDir;
+ tstring itsFilter;
+ tstring itsDefExt;
- static const TCHAR* ifNotEmpty(const SmartUtil::tstring& str) {
+ static const TCHAR* ifNotEmpty(const tstring& str) {
return str.empty() ? NULL : str.c_str();
}
};
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectSizable.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -154,7 +154,7 @@
* then continues with the next row. <br>
* The internal position of bound is updated.
*/
- void setSizePerTextPerPlace( Place & bound, const SmartUtil::tstring & text,
+ void setSizePerTextPerPlace( Place & bound, const tstring & text,
int extraX = 0, int extraY = 0 );
/// Returns the screen size.
@@ -200,7 +200,7 @@
* This is useful if you want to allocate enough space to fit known text. <br>
* It accounts for the set font too.
*/
- Point getTextSize( const SmartUtil::tstring & text );
+ Point getTextSize( const tstring & text );
/// Brings the widget to the front
/** Makes the widget become the front most widget meaning it will not be obscured
@@ -342,7 +342,7 @@
template< class WidgetType >
void AspectSizable< WidgetType >
-::setSizePerTextPerPlace( Place & bound, const SmartUtil::tstring & text,
+::setSizePerTextPerPlace( Place & bound, const tstring & text,
int extraX, int extraY )
{
Point textSize = getTextSize( text );
@@ -418,7 +418,7 @@
template< class WidgetType >
Point AspectSizable< WidgetType >
-::getTextSize( const SmartUtil::tstring & text )
+::getTextSize( const tstring & text )
{
// Some win32 api code to determine the actual size of the string
HWND hWnd = H();
Modified: dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/aspects/AspectText.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -36,7 +36,7 @@
#ifndef DWT_AspectText_h
#define DWT_AspectText_h
-#include "../util/tstring.h"
+#include "../tstring.h"
#include "../Dispatchers.h"
#include "../Message.h"
@@ -54,22 +54,22 @@
WidgetType& W() { return *static_cast<WidgetType*>(this); }
const WidgetType& W() const { return *static_cast<const WidgetType*>(this); }
- static SmartUtil::tstring getText(const MSG& msg) {
- return SmartUtil::tstring( reinterpret_cast< TCHAR * >( msg.lParam ) );
+ static tstring getText(const MSG& msg) {
+ return tstring( reinterpret_cast< TCHAR * >( msg.lParam ) );
}
- typedef Dispatchers::ConvertBase<SmartUtil::tstring, &AspectText<WidgetType>::getText, false> Dispatcher;
- friend class Dispatchers::ConvertBase<SmartUtil::tstring, &AspectText<WidgetType>::getText, false>;
+ typedef Dispatchers::ConvertBase<tstring, &AspectText<WidgetType>::getText, false> Dispatcher;
+ friend class Dispatchers::ConvertBase<tstring, &AspectText<WidgetType>::getText, false>;
public:
/// Sets the text of the AspectText realizing class
/** The txt parameter is the new text to put into the realizing object.
*/
- void setText( const SmartUtil::tstring & txt );
+ void setText( const tstring & txt );
/// Gets the text of the AspectText realizing class
/** The Return value is the text of the realizing class.
*/
- SmartUtil::tstring getText() const;
+ tstring getText() const;
/// Length of text in characters
size_t length() const;
@@ -77,7 +77,7 @@
/// \ingroup EventHandlersAspectText
/// Setting the event handler for the "setText" event
/** When the text changes in the Widget this event will be raised. <br>
- * The parameter passed is SmartUtil::tstring & which is the new text of the
+ * The parameter passed is tstring & which is the new text of the
* Widget.
*/
void onTextChanging(const typename Dispatcher::F& f) {
@@ -92,7 +92,7 @@
// Implementation of class
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
template< class WidgetType >
-void AspectText< WidgetType >::setText( const SmartUtil::tstring & txt ) {
+void AspectText< WidgetType >::setText( const tstring & txt ) {
W().sendMessage(WM_SETTEXT, 0, reinterpret_cast< LPARAM >(txt.c_str()) );
}
@@ -102,12 +102,12 @@
}
template< class WidgetType >
-SmartUtil::tstring AspectText< WidgetType >::getText() const
+tstring AspectText< WidgetType >::getText() const
{
size_t textLength = length();
if ( textLength == 0 )
return _T( "" );
- SmartUtil::tstring retVal(textLength + 1, 0);
+ tstring retVal(textLength + 1, 0);
retVal.resize(W().sendMessage(WM_GETTEXT, static_cast<WPARAM>(textLength + 1), reinterpret_cast<LPARAM>(&retVal[0])));
return retVal;
}
Modified: dcplusplus/trunk/dwt/include/dwt/dwt.hpp
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/dwt.hpp 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/dwt.hpp 2008-04-14 20:28:35 UTC (rev 1155)
@@ -57,7 +57,7 @@
#include "resources/Icon.h"
#include "resources/ImageList.h"
#include "resources/Pen.h"
-#include "util/tstring.h"
+#include "tstring.h"
#include "widgets/Button.h"
#include "widgets/CheckBox.h"
#include "widgets/ComboBox.h"
Modified: dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/resources/Bitmap.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -37,7 +37,7 @@
#define DWT_Bitmap_h
#include "../WindowsHeaders.h"
-#include "../util/tstring.h"
+#include "../tstring.h"
#include "Handle.h"
#include <boost/intrusive_ptr.hpp>
@@ -90,7 +90,7 @@
* <li>Icons (ICO)</li>
* </ul>
*/
- explicit Bitmap( const SmartUtil::tstring & filePath, unsigned flags = LR_CREATEDIBSECTION );
+ explicit Bitmap( const tstring & filePath, unsigned flags = LR_CREATEDIBSECTION );
/// @deprecated, use handle
HBITMAP getBitmap() const;
Modified: dcplusplus/trunk/dwt/include/dwt/resources/Font.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/resources/Font.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/resources/Font.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -37,7 +37,7 @@
#define DWT_Font_h
#include "../WindowsHeaders.h"
-#include "../util/tstring.h"
+#include "../tstring.h"
#include "../xCeption.h"
#include "Handle.h"
@@ -94,7 +94,7 @@
/** The object can't be manipulated after creation so when creating an instance
* of this class be sure you are certain that you know what you want.
*/
- Font( const SmartUtil::tstring & faceName, int height = 10,
+ Font( const tstring & faceName, int height = 10,
int width = 10,
int weight = 2,
DWORD charSet = ANSI_CHARSET,
@@ -152,7 +152,7 @@
* typedef FontPtr and not <br>
* the shared_ptr itself since this may change in future releases.
*/
-FontPtr createFont( const SmartUtil::tstring & faceName,
+FontPtr createFont( const tstring & faceName,
int height = 10,
int width = 10,
int weight = 2,
Modified: dcplusplus/trunk/dwt/include/dwt/resources/Icon.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/resources/Icon.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/resources/Icon.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -37,7 +37,7 @@
#define DWT_Icon_h
#include "../WindowsHeaders.h"
-#include "../util/tstring.h"
+#include "../tstring.h"
#include "Handle.h"
namespace dwt {
@@ -81,7 +81,7 @@
* Class takes "control" of HICON meaning it will automatically free the
* contained HICON upon destruction
*/
- explicit Icon( const SmartUtil::tstring & filePath );
+ explicit Icon( const tstring & filePath );
/// Deprecated, use handle()
HICON getIcon() const;
Modified: dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/resources/ImageList.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -37,7 +37,7 @@
#define DWT_ImageList_h
#include "../WindowsHeaders.h"
-#include "../util/tstring.h"
+#include "../tstring.h"
#include "../Point.h"
#include "Bitmap.h"
#include "Icon.h"
Copied: dcplusplus/trunk/dwt/include/dwt/tstring.h (from rev 1154, dcplusplus/trunk/dwt/include/dwt/util/tstring.h)
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/tstring.h (rev 0)
+++ dcplusplus/trunk/dwt/include/dwt/tstring.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -0,0 +1,55 @@
+/*
+ DC++ Widget Toolkit
+
+ Copyright (c) 2007-2008, Jacek Sieka
+
+ SmartWin++
+
+ Copyright (c) 2005 Thomas Hansen
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the DWT nor SmartWin++ nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <string>
+
+#ifndef DWT_tstring_smartwin_H
+#define DWT_tstring_smartwin_H
+
+namespace dwt {
+
+#if defined UNICODE || defined _UNICODE
+
+typedef std::wstring tstring;
+
+#else // UNICODE
+
+typedef std::string tstring;
+
+#endif //UNICODE
+
+}
+
+#endif
Deleted: dcplusplus/trunk/dwt/include/dwt/util/ChooseWideNarrowChar.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/util/ChooseWideNarrowChar.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/util/ChooseWideNarrowChar.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -1,95 +0,0 @@
-/*
- DC++ Widget Toolkit
-
- Copyright (c) 2007-2008, Jacek Sieka
-
- SmartWin++
-
- Copyright (c) 2005 Thomas Hansen
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the DWT nor SmartWin++ nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-namespace SmartUtil
-{
-// begin namespace SmartUtil
-
-#if defined UNICODE || defined _UNICODE
- typedef wchar_t tchar;
-# ifndef _INC_TCHAR
-# define _T(x) L##x
-# endif
-# if defined _STRING_ || defined _GLIBCXX_STRING
- typedef std::wstring tstring;
-# endif //_STRING_
-# if defined _IOSTREAM_ || defined _GLIBCXX_IOSTREAM
- typedef std::wcout tcout;
-# endif //_IOSTREAM_
-# if defined _SSTREAM_ || defined _GLIBCXX_SSTREAM
- typedef std::wstringstream tstringstream;
-# endif //_SSTREAM_
-# if defined _OSTREAM_ || defined _GLIBCXX_OSTREAM
- typedef std::wostream tostream;
-# endif //_OSTREAM_
-# if defined _ISTREAM_ || defined _GLIBCXX_ISTREAM
- typedef std::wistream tistream;
-# endif //_ISTREAM_
-# if defined _FSTREAM_ || defined _GLIBCXX_FSTREAM
- typedef std::wfilebuf tfilebuf;
- typedef std::wfstream tfstream;
- typedef std::wifstream tifstream;
- typedef std::wofstream tofstream;
-# endif //_FSTREAM_
-#else // UNICODE
- typedef char tchar;
-# ifndef _INC_TCHAR
-# define _T(x) x
-# endif
-# if defined _STRING_ || defined _GLIBCXX_STRING
- typedef std::string tstring;
-# endif //_STRING_
-# if defined _IOSTREAM_ || defined _GLIBCXX_IOSTREAM
- typedef std::cout tcout;
-# endif //_IOSTREAM_
-# if defined _SSTREAM_ || defined _GLIBCXX_SSTREAM
- typedef std::stringstream tstringstream;
-# endif //_SSTREAM_
-# if defined _OSTREAM_ || defined _GLIBCXX_OSTREAM
- typedef std::ostream tostream;
-# endif //_OSTREAM_
-# if defined _ISTREAM_ || defined _GLIBCXX_ISTREAM
- typedef std::istream tistream;
-# endif //_ISTREAM_
-# if defined _FSTREAM_ || defined _GLIBCXX_FSTREAM
- typedef std::filebuf tfilebuf;
- typedef std::fstream tfstream;
- typedef std::ifstream tifstream;
- typedef std::ofstream tofstream;
-# endif //_FSTREAM_
-#endif //UNICODE
-
-// end namespace SmartUtil
-}
Modified: dcplusplus/trunk/dwt/include/dwt/util/DateTime.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/util/DateTime.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/util/DateTime.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -36,96 +36,96 @@
#ifndef DWT_DateTime_H
#define DWT_DateTime_H
-#include <string.h>
#include "../WindowsHeaders.h"
-#include "TimeSpan.h"
-#include "tstring.h"
+#include "../tstring.h"
#include <time.h>
-/// Contains utility classes for helping out with different aspects in SmartWin and SmartSOAP
-namespace SmartUtil
+namespace dwt { namespace util {
+
+class DateTime;
+class TimeSpan;
+
+DateTime operator +( const DateTime & date, const TimeSpan & time );
+DateTime operator -( const DateTime & date, const TimeSpan & time );
+
+/// Date and Time class
+/** Class is inspired from the .Net Framework class System.DateTime and usable areas would be e.g. to parse DateTime objects transfered across SOAP callings
+ */
+class DateTime
{
- class DateTime;
- DateTime operator +( const DateTime & date, const TimeSpan & time );
- DateTime operator -( const DateTime & date, const TimeSpan & time );
+ friend DateTime operator +( const DateTime & date, const TimeSpan & time );
+ friend DateTime operator -( const DateTime & date, const TimeSpan & time );
+private:
+ SYSTEMTIME itsSysTime;
- /// Date and Time class
- /** Class is inspired from the .Net Framework class System.DateTime and usable areas would be e.g. to parse DateTime objects transfered across SOAP callings
- */
- class DateTime
- {
- friend DateTime operator +( const DateTime & date, const TimeSpan & time );
- friend DateTime operator -( const DateTime & date, const TimeSpan & time );
- private:
- SYSTEMTIME itsSysTime;
+public:
+ /// Constructs by default the smallest possible date
+ DateTime();
- public:
- /// Constructs by default the smallest possible date
- DateTime();
+ /// Construct a new DateTime from the given SYSTEMTIME
+ explicit DateTime( const SYSTEMTIME & sysTime );
- /// Construct a new DateTime from the given SYSTEMTIME
- explicit DateTime( const SYSTEMTIME & sysTime );
+ /// Constructs a date according to the values given
+ DateTime( unsigned year, unsigned month, unsigned day, unsigned hour = 0, unsigned minute = 0, unsigned seconds = 0, unsigned milliseconds = 0 );
- /// Constructs a date according to the values given
- DateTime( unsigned year, unsigned month, unsigned day, unsigned hour = 0, unsigned minute = 0, unsigned seconds = 0, unsigned milliseconds = 0 );
+ /// Constructs a date according to a unix timestamp value
+ DateTime( time_t unixtimestamp );
- /// Constructs a date according to a unix timestamp value
- DateTime( time_t unixtimestamp );
+ /// Copy constructor
+ DateTime( const DateTime & rhs );
- /// Copy constructor
- DateTime( const DateTime & rhs );
+ /// Assignment operator which makes a perfect copy of the DateTime object on the right hand side of the assignment operator
+ DateTime & operator =( const DateTime & rhs );
- /// Assignment operator which makes a perfect copy of the DateTime object on the right hand side of the assignment operator
- DateTime & operator =( const DateTime & rhs );
+ /// Assignment operator which makes a copy of the SYSTEMTIME object on the right hand side of the assignment operator
+ DateTime & operator =( const SYSTEMTIME & rhs );
- /// Assignment operator which makes a copy of the SYSTEMTIME object on the right hand side of the assignment operator
- DateTime & operator =( const SYSTEMTIME & rhs );
+ /// Explicit conversion to SYSTEMTIME
+ const SYSTEMTIME & getSystemTime();
- /// Explicit conversion to SYSTEMTIME
- const SYSTEMTIME & getSystemTime();
+ /// Stamps the time part of the DateTime and returns an object containing only DATE information (or the TIME information is all zeros)
+ DateTime date();
- /// Stamps the time part of the DateTime and returns an object containing only DATE information (or the TIME information is all zeros)
- DateTime date();
+ /// Static constructor creating a DateTime which will hold the Date and Time of the creation of the object
+ static DateTime now();
- /// Static constructor creating a DateTime which will hold the Date and Time of the creation of the object
- static DateTime now();
+ /// Static constructor creating the smallest possible value
+ static DateTime minValue();
- /// Static constructor creating the smallest possible value
- static DateTime minValue();
+ /// Converts the date to a string in the format "yyyy.MM.ddThh:mm:ss"
+ /** Example: "2005.12.29T23:11:52"
+ */
+ tstring toString() const;
- /// Converts the date to a string in the format "yyyy.MM.ddThh:mm:ss"
- /** Example: "2005.12.29T23:11:52"
- */
- tstring toString() const;
+ /// Returns a string containing only the Time of the object
+ /** The format must be in format of e.g. "hh.mm.ss" or "mm-ss/hh" etc where "hh" is hours, "mm" is minutes and "ss" is seconds.
+ */
+ tstring toTimeString( const tstring & format ) const;
- /// Returns a string containing only the Time of the object
- /** The format must be in format of e.g. "hh.mm.ss" or "mm-ss/hh" etc where "hh" is hours, "mm" is minutes and "ss" is seconds.
- */
- tstring toTimeString( const tstring & format ) const;
+ /// Returns only the date part of the date time structure in a string format
+ /** The format must be in format of e.g. "dd:MM-yyyy" or "yyyy:MM:dd" where "yyyy" is four digits year, "MM" is two digits months and "dd" is two digits day.
+ */
+ tstring toDateString( const tstring & format ) const;
- /// Returns only the date part of the date time structure in a string format
- /** The format must be in format of e.g. "dd:MM-yyyy" or "yyyy:MM:dd" where "yyyy" is four digits year, "MM" is two digits months and "dd" is two digits day.
- */
- tstring toDateString( const tstring & format ) const;
+ /// Converts the date to a unix timestamp
+ time_t toUnixTimestamp() const;
+};
- /// Converts the date to a unix timestamp
- time_t toUnixTimestamp() const;
- };
+// TODO: Comments....
+DateTime operator +( const DateTime & date, const TimeSpan & time );
- // TODO: Comments....
- DateTime operator +( const DateTime & date, const TimeSpan & time );
+bool operator >( const DateTime & lhs, const DateTime & rhs );
- bool operator >( const DateTime & lhs, const DateTime & rhs );
+bool operator <( const DateTime & lhs, const DateTime & rhs );
- bool operator <( const DateTime & lhs, const DateTime & rhs );
+bool operator >=( const DateTime & lhs, const DateTime & rhs );
- bool operator >=( const DateTime & lhs, const DateTime & rhs );
+bool operator <=( const DateTime & lhs, const DateTime & rhs );
- bool operator <=( const DateTime & lhs, const DateTime & rhs );
+bool operator == ( const DateTime & lhs, const DateTime & rhs );
- bool operator == ( const DateTime & lhs, const DateTime & rhs );
+bool operator != ( const DateTime & lhs, const DateTime & rhs );
+
+} }
- bool operator != ( const DateTime & lhs, const DateTime & rhs );
-}
-
#endif
Modified: dcplusplus/trunk/dwt/include/dwt/util/RegKey.h
===================================================================
--- dcplusplus/trunk/dwt/include/dwt/util/RegKey.h 2008-04-14 20:24:38 UTC (rev 1154)
+++ dcplusplus/trunk/dwt/include/dwt/util/RegKey.h 2008-04-14 20:28:35 UTC (rev 1155)
@@ -37,122 +37,122 @@
#define DWT_RegKey_H
#include "../WindowsHeaders.h"
-#include "tstring.h"
+#include "../tstring.h"
#include "xCeptionSmartUtilities.h"
-#include <shlwapi.h>
#include <vector>
/// Contains utility class for reading and editing the registry
-namespace SmartUtil
+namespace dwt { namespace util {
+
+class RegKey
{
- class RegKey
- {
- private:
- HKEY m_hKeyHandle;
- DWORD m_dwDisposition;
- REGSAM m_pAccess;
+private:
+ HKEY m_hKeyHandle;
+ DWORD m_dwDisposition;
+ REGSAM m_pAccess;
- struct _REGKEYINFO {
- TCHAR achClass[MAX_PATH]; // buffer for class name
- DWORD cchClassName; // size of class string
- DWORD cSubKeys; // number of subkeys
- DWORD cbMaxSubKey; // longest subkey size
- DWORD cchMaxClass; // longest class string
- DWORD cValues; // number of values for key
- DWORD cchMaxValue; // longest value name
- DWORD cbMaxValueData; // longest value data
- DWORD cbSecurityDescriptor; // size of security descriptor
- FILETIME ftLastWriteTime; // last write time
- } REGKEYINFO;
- public:
- /// Normal constructor
- /** Constructs a new instanc of this class
- */
- RegKey(void);
+ struct _REGKEYINFO {
+ TCHAR achClass[MAX_PATH]; // buffer for class name
+ DWORD cchClassName; // size of class string
+ DWORD cSubKeys; // number of subkeys
+ DWORD cbMaxSubKey; // longest subkey size
+ DWORD cchMaxClass; // longest class string
+ DWORD cValues; // number of values for key
+ DWORD cchMaxValue; // longest value name
+ DWORD cbMaxValueData; // longest value data
+ DWORD cbSecurityDescriptor; // size of security descriptor
+ FILETIME ftLastWriteTime; // last write time
+ } REGKEYINFO;
+public:
+ /// Normal constructor
+ /** Constructs a new instanc of this class
+ */
+ RegKey(void);
- /// Constructor, with parameters to open/create a reg key
- /** Constructor taking a hKey and SmartUtil::tstring to specify the key to open. <br>
- * hKey could be HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE or HKEY_USERS
- */
- RegKey(HKEY hKey, SmartUtil::tstring lpSubKey,REGSAM samDesired = KEY_ALL_ACCESS,bool createIfNotExists = false);
+ /// Constructor, with parameters to open/create a reg key
+ /** Constructor taking a hKey and tstring to specify the key to open. <br>
+ * hKey could be HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE or HKEY_USERS
+ */
+ RegKey(HKEY hKey, tstring lpSubKey,REGSAM samDesired = KEY_ALL_ACCESS,bool createIfNotExists = false);
- /// Deconstructor
- /** Deconstructor, close keys if they are still open
- */
- ~RegKey(void);
+ /// Deconstructor
+ /** Deconstructor, close keys if they are still open
+ */
+ ~RegKey(void);
- /// Open or create a reg key
- /** Open a reg key or create before <br>
- * hKey could be HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE or HKEY_USERS
- */
- bool open(HKEY hKey, SmartUtil::tstring lpSubKey,REGSAM samDesired = KEY_ALL_ACCESS,bool createIfNotExists = false);
+ /// Open or create a reg key
+ /** Open a reg key or create before <br>
+ * hKey could be HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE or HKEY_USERS
+ */
+ bool open(HKEY hKey, tstring lpSubKey,REGSAM samDesired = KEY_ALL_ACCESS,bool createIfNotExists = false);
- /// Close open key
- /** Close open key
- */
- void close(void);
+ /// Close open key
+ /** Close open key
+ */
+ void close(void);
- /// Check for an open key
- /** Check for an open key
- */
- bool isOpen(void) { return (m_hKeyHandle != NULL); }
+ /// Check for an open key
+ /** Check for an open key
+ */
+ bool isOpen(void) { return (m_hKeyHandle != NULL); }
- /// Check for a new key
- /** Call this if you are sure that you have an open key!
- * It returns true if the open key was created by open or false if that key alredy exists.
- */
- bool isNewKey(void) { return (m_dwDisposition == REG_CREATED_NEW_KEY); }
+ /// Check for a new key
+ /** Call this if you are sure that you have an open key!
+ * It returns true if the open key was created by open or false if that key alredy exists.
+ */
+ bool isNewKey(void) { return (m_dwDisposition == REG_CREATED_NEW_KEY); }
- /// Delete the specific subkey of the current open key
- /** Delete the specific subkey of the current open key. The key must be empty or set recursiv=true to delete all content, too.
- */
- bool deleteSubkey(SmartUtil::tstring lpSubKey, bool recursiv = false);
+ /// Delete the specific subkey of the current open key
+ /** Delete the specific subkey of the current open key. The key must be empty or set recursiv=true to delete all content, too.
+ */
+ bool deleteSubkey(tstring lpSubKey, bool recursiv = false);
- /// Delete the specific value of the current open key
- /** Delete the specific value of the current open key
- */
- bool deleteValue(SmartUtil::tstring lpValue);
+ /// Delete the specific value of the current...
[truncated message content] |
