Changeset 1452
- Timestamp:
- May 28, 2008, 3:09:33 PM (17 years ago)
- Location:
- code/branches/network
- Files:
-
- 3 edited
-
src/core/OutputHandler.cc (modified) (2 diffs)
-
src/core/OutputHandler.h (modified) (4 diffs)
-
visual_studio/vc8/core.vcproj (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network/src/core/OutputHandler.cc
r1446 r1452 35 35 #include "CoreSettings.h" 36 36 #include "ConsoleCommand.h" 37 #include "Shell.h" 37 38 38 39 namespace orxonox … … 83 84 { 84 85 return CoreSettings::getSoftDebugLevel(device); 86 } 87 88 /** 89 @brief Returns the Shell's OutputBuffer. This is mere placed here to avoid 90 recompiling the entire project when Shell.h changes. 91 @return The OutputBuffer of the Shell 92 */ 93 OutputBuffer& OutputHandler::getShellOutputBuffer() 94 { 95 return Shell::getInstance().getOutputBuffer(); 85 96 } 86 97 -
code/branches/network/src/core/OutputHandler.h
r1446 r1452 44 44 #include <string> 45 45 46 #include " Shell.h"46 #include "OutputBuffer.h" 47 47 48 48 namespace orxonox … … 95 95 96 96 static int getSoftDebugLevel(OutputHandler::OutputDevice device); 97 98 OutputBuffer& getShellOutputBuffer(); 97 99 98 100 template <class T> … … 157 159 158 160 if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_) 159 Shell::getInstance().getOutputBuffer() << output;161 OutputHandler::getOutStream().getShellOutputBuffer() << output; 160 162 161 163 return *this; … … 181 183 182 184 if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= out.getOutputLevel()) 183 Shell::getInstance().getOutputBuffer() << output;185 OutputHandler::getOutStream().getShellOutputBuffer() << output; 184 186 185 187 return out; -
code/branches/network/visual_studio/vc8/core.vcproj
r1449 r1452 149 149 > 150 150 <File 151 RelativePath="..\..\src\core\ArgumentCompletionFunctions.cc"152 >153 </File>154 <File155 RelativePath="..\..\src\core\BaseObject.cc"156 >157 </File>158 <File159 RelativePath="..\..\src\core\ClassTreeMask.cc"160 >161 </File>162 <File163 RelativePath="..\..\src\core\CommandEvaluation.cc"164 >165 </File>166 <File167 RelativePath="..\..\src\core\CommandExecutor.cc"168 >169 </File>170 <File171 151 RelativePath="..\..\src\core\ConfigFileManager.cc" 172 152 > … … 177 157 </File> 178 158 <File 179 RelativePath="..\..\src\core\ConsoleCommand.cc"180 >181 </File>182 <File183 RelativePath="..\..\src\core\ConsoleCommandCompilation.cc"184 >185 </File>186 <File187 159 RelativePath="..\..\src\core\CoreSettings.cc" 188 160 > … … 193 165 </File> 194 166 <File 195 RelativePath="..\..\src\core\Executor.cc"196 >197 </File>198 <File199 RelativePath="..\..\src\core\Factory.cc"200 >201 </File>202 <File203 RelativePath="..\..\src\core\Identifier.cc"204 >205 </File>206 <File207 RelativePath="..\..\src\core\IdentifierDistributor.cc"208 >209 </File>210 <File211 RelativePath="..\..\src\core\InputBuffer.cc"212 >213 </File>214 <File215 RelativePath="..\..\src\core\InputManager.cc"216 >217 </File>218 <File219 RelativePath="..\..\src\core\IRC.cc"220 >221 </File>222 <File223 RelativePath="..\..\src\core\KeyBinder.cc"224 >225 </File>226 <File227 167 RelativePath="..\..\src\core\Language.cc" 228 168 > 229 169 </File> 230 170 <File 231 RelativePath="..\..\src\core\Loader.cc"232 >233 </File>234 <File235 RelativePath="..\..\src\core\MetaObjectList.cc"236 >237 </File>238 <File239 RelativePath="..\..\src\core\Namespace.cc"240 >241 </File>242 <File243 RelativePath="..\..\src\core\NamespaceNode.cc"244 >245 </File>246 <File247 171 RelativePath="..\..\src\core\OrxonoxClass.cc" 248 172 > … … 261 185 </File> 262 186 <File 263 RelativePath="..\..\src\core\Shell.cc"264 >265 </File>266 <File267 187 RelativePath="..\..\src\core\SignalHandler.cc" 268 188 > 269 189 </File> 270 190 <File 271 RelativePath="..\..\src\core\TclBind.cc"272 >273 </File>274 <File275 RelativePath="..\..\src\core\TclThreadManager.cc"276 >277 </File>278 <File279 191 RelativePath="..\..\src\core\Tickable.cc" 280 192 > 281 193 </File> 282 <File283 RelativePath="..\..\src\core\XMLPort.cc"284 >285 </File>286 194 <Filter 287 195 Name="tolua" … … 289 197 <File 290 198 RelativePath="..\..\src\core\tolua\tolua_bind.cc" 199 > 200 </File> 201 </Filter> 202 <Filter 203 Name="command" 204 > 205 <File 206 RelativePath="..\..\src\core\ArgumentCompletionFunctions.cc" 207 > 208 </File> 209 <File 210 RelativePath="..\..\src\core\CommandEvaluation.cc" 211 > 212 </File> 213 <File 214 RelativePath="..\..\src\core\CommandExecutor.cc" 215 > 216 </File> 217 <File 218 RelativePath="..\..\src\core\ConsoleCommand.cc" 219 > 220 </File> 221 <File 222 RelativePath="..\..\src\core\ConsoleCommandCompilation.cc" 223 > 224 </File> 225 <File 226 RelativePath="..\..\src\core\Executor.cc" 227 > 228 </File> 229 </Filter> 230 <Filter 231 Name="hierarchy" 232 > 233 <File 234 RelativePath="..\..\src\core\Factory.cc" 235 > 236 </File> 237 <File 238 RelativePath="..\..\src\core\Identifier.cc" 239 > 240 </File> 241 <File 242 RelativePath="..\..\src\core\IdentifierDistributor.cc" 243 > 244 </File> 245 <File 246 RelativePath="..\..\src\core\MetaObjectList.cc" 247 > 248 </File> 249 </Filter> 250 <Filter 251 Name="level" 252 > 253 <File 254 RelativePath="..\..\src\core\BaseObject.cc" 255 > 256 </File> 257 <File 258 RelativePath="..\..\src\core\ClassTreeMask.cc" 259 > 260 </File> 261 <File 262 RelativePath="..\..\src\core\Loader.cc" 263 > 264 </File> 265 <File 266 RelativePath="..\..\src\core\Namespace.cc" 267 > 268 </File> 269 <File 270 RelativePath="..\..\src\core\NamespaceNode.cc" 271 > 272 </File> 273 <File 274 RelativePath="..\..\src\core\XMLPort.cc" 275 > 276 </File> 277 </Filter> 278 <Filter 279 Name="input" 280 > 281 <File 282 RelativePath="..\..\src\core\InputBuffer.cc" 283 > 284 </File> 285 <File 286 RelativePath="..\..\src\core\InputManager.cc" 287 > 288 </File> 289 <File 290 RelativePath="..\..\src\core\KeyBinder.cc" 291 > 292 </File> 293 </Filter> 294 <Filter 295 Name="shell" 296 > 297 <File 298 RelativePath="..\..\src\core\IRC.cc" 299 > 300 </File> 301 <File 302 RelativePath="..\..\src\core\Shell.cc" 303 > 304 </File> 305 <File 306 RelativePath="..\..\src\core\TclBind.cc" 307 > 308 </File> 309 <File 310 RelativePath="..\..\src\core\TclThreadManager.cc" 291 311 > 292 312 </File> … … 299 319 > 300 320 <File 301 RelativePath="..\..\src\core\ArgumentCompleter.h"302 >303 </File>304 <File305 RelativePath="..\..\src\core\ArgumentCompletionFunctions.h"306 >307 </File>308 <File309 RelativePath="..\..\src\core\ArgumentCompletionListElement.h"310 >311 </File>312 <File313 RelativePath="..\..\src\core\BaseObject.h"314 >315 </File>316 <File317 RelativePath="..\..\src\core\ClassFactory.h"318 >319 </File>320 <File321 RelativePath="..\..\src\core\ClassManager.h"322 >323 </File>324 <File325 RelativePath="..\..\src\core\ClassTreeMask.h"326 >327 </File>328 <File329 RelativePath="..\..\src\core\CommandEvaluation.h"330 >331 </File>332 <File333 RelativePath="..\..\src\core\CommandExecutor.h"334 >335 </File>336 <File337 321 RelativePath="..\..\src\core\ConfigFileManager.h" 338 322 > … … 347 331 </File> 348 332 <File 349 RelativePath="..\..\src\core\ConsoleCommand.h"350 >351 </File>352 <File353 RelativePath="..\..\src\core\ConsoleCommandCompilation.h"354 >355 </File>356 <File357 RelativePath="..\..\src\core\CoreIncludes.h"358 >359 </File>360 <File361 333 RelativePath="..\..\src\core\CorePrereqs.h" 362 334 > … … 375 347 </File> 376 348 <File 377 RelativePath="..\..\src\core\Executor.h"378 >379 </File>380 <File381 RelativePath="..\..\src\core\Factory.h"382 >383 </File>384 <File385 RelativePath="..\..\src\core\Functor.h"386 >387 </File>388 <File389 RelativePath="..\..\src\core\Identifier.h"390 >391 </File>392 <File393 RelativePath="..\..\src\core\IdentifierDistributor.h"394 >395 </File>396 <File397 RelativePath="..\..\src\core\InputBuffer.h"398 >399 </File>400 <File401 RelativePath="..\..\src\core\InputInterfaces.h"402 >403 </File>404 <File405 RelativePath="..\..\src\core\InputManager.h"406 >407 </File>408 <File409 RelativePath="..\..\src\core\IRC.h"410 >411 </File>412 <File413 RelativePath="..\..\src\core\Iterator.h"414 >415 </File>416 <File417 RelativePath="..\..\src\core\KeyBinder.h"418 >419 </File>420 <File421 349 RelativePath="..\..\src\core\Language.h" 422 350 > 423 351 </File> 424 352 <File 425 RelativePath="..\..\src\core\Level.h"426 >427 </File>428 <File429 RelativePath="..\..\src\core\Loader.h"430 >431 </File>432 <File433 RelativePath="..\..\src\core\MetaObjectList.h"434 >435 </File>436 <File437 RelativePath="..\..\src\core\Namespace.h"438 >439 </File>440 <File441 RelativePath="..\..\src\core\NamespaceNode.h"442 >443 </File>444 <File445 RelativePath="..\..\src\core\ObjectList.h"446 >447 </File>448 <File449 353 RelativePath="..\..\src\core\OrxonoxClass.h" 450 354 > … … 467 371 </File> 468 372 <File 469 RelativePath="..\..\src\core\Shell.h"470 >471 </File>472 <File473 373 RelativePath="..\..\src\core\SignalHandler.h" 474 374 > 475 375 </File> 476 376 <File 477 RelativePath="..\..\src\core\TclBind.h"478 >479 </File>480 <File481 RelativePath="..\..\src\core\TclThreadManager.h"482 >483 </File>484 <File485 377 RelativePath="..\..\src\core\Tickable.h" 486 378 > 487 379 </File> 488 <File 489 RelativePath="..\..\src\core\XMLPort.h" 490 > 491 </File> 380 <Filter 381 Name="input" 382 > 383 <File 384 RelativePath="..\..\src\core\InputBuffer.h" 385 > 386 </File> 387 <File 388 RelativePath="..\..\src\core\InputInterfaces.h" 389 > 390 </File> 391 <File 392 RelativePath="..\..\src\core\InputManager.h" 393 > 394 </File> 395 <File 396 RelativePath="..\..\src\core\KeyBinder.h" 397 > 398 </File> 399 </Filter> 400 <Filter 401 Name="command" 402 > 403 <File 404 RelativePath="..\..\src\core\ArgumentCompleter.h" 405 > 406 </File> 407 <File 408 RelativePath="..\..\src\core\ArgumentCompletionFunctions.h" 409 > 410 </File> 411 <File 412 RelativePath="..\..\src\core\ArgumentCompletionListElement.h" 413 > 414 </File> 415 <File 416 RelativePath="..\..\src\core\CommandEvaluation.h" 417 > 418 </File> 419 <File 420 RelativePath="..\..\src\core\CommandExecutor.h" 421 > 422 </File> 423 <File 424 RelativePath="..\..\src\core\ConsoleCommand.h" 425 > 426 </File> 427 <File 428 RelativePath="..\..\src\core\ConsoleCommandCompilation.h" 429 > 430 </File> 431 <File 432 RelativePath="..\..\src\core\Executor.h" 433 > 434 </File> 435 <File 436 RelativePath="..\..\src\core\Functor.h" 437 > 438 </File> 439 </Filter> 440 <Filter 441 Name="shell" 442 > 443 <File 444 RelativePath="..\..\src\core\IRC.h" 445 > 446 </File> 447 <File 448 RelativePath="..\..\src\core\Shell.h" 449 > 450 </File> 451 <File 452 RelativePath="..\..\src\core\TclBind.h" 453 > 454 </File> 455 <File 456 RelativePath="..\..\src\core\TclThreadManager.h" 457 > 458 </File> 459 </Filter> 460 <Filter 461 Name="hierarchy" 462 > 463 <File 464 RelativePath="..\..\src\core\ClassFactory.h" 465 > 466 </File> 467 <File 468 RelativePath="..\..\src\core\ClassManager.h" 469 > 470 </File> 471 <File 472 RelativePath="..\..\src\core\CoreIncludes.h" 473 > 474 </File> 475 <File 476 RelativePath="..\..\src\core\Factory.h" 477 > 478 </File> 479 <File 480 RelativePath="..\..\src\core\Identifier.h" 481 > 482 </File> 483 <File 484 RelativePath="..\..\src\core\IdentifierDistributor.h" 485 > 486 </File> 487 <File 488 RelativePath="..\..\src\core\Iterator.h" 489 > 490 </File> 491 <File 492 RelativePath="..\..\src\core\MetaObjectList.h" 493 > 494 </File> 495 <File 496 RelativePath="..\..\src\core\ObjectList.h" 497 > 498 </File> 499 </Filter> 500 <Filter 501 Name="level" 502 > 503 <File 504 RelativePath="..\..\src\core\BaseObject.h" 505 > 506 </File> 507 <File 508 RelativePath="..\..\src\core\ClassTreeMask.h" 509 > 510 </File> 511 <File 512 RelativePath="..\..\src\core\Level.h" 513 > 514 </File> 515 <File 516 RelativePath="..\..\src\core\Loader.h" 517 > 518 </File> 519 <File 520 RelativePath="..\..\src\core\Namespace.h" 521 > 522 </File> 523 <File 524 RelativePath="..\..\src\core\NamespaceNode.h" 525 > 526 </File> 527 <File 528 RelativePath="..\..\src\core\XMLPort.h" 529 > 530 </File> 531 </Filter> 492 532 <Filter 493 533 Name="tolua"
Note: See TracChangeset
for help on using the changeset viewer.
