diff options
| author |  Noldor | 2008-09-25 18:19:53 +0000 |
|---|---|---|
| committer | Noldor | 2008-09-25 18:19:53 +0000 |
| commit | 7f5f8c86ca67afda71c238e370c953df5adba9a6 (patch) | |
| tree | 4e5a4d38cf6136a609082676058475a55cded2ef /src | |
| parent | more work on the help search (diff) | |
| download | KVIrc-7f5f8c86ca67afda71c238e370c953df5adba9a6.tar.gz KVIrc-7f5f8c86ca67afda71c238e370c953df5adba9a6.tar.bz2 KVIrc-7f5f8c86ca67afda71c238e370c953df5adba9a6.zip | |
update win projects + some compilation fixes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2570 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
21 files changed, 65 insertions, 72 deletions
diff --git a/src/modules/addon/addon_QT4_vc05.vcproj b/src/modules/addon/addon_QT4_vc05.vcproj index 941124ebc..7d9c9e1f7 100644 --- a/src/modules/addon/addon_QT4_vc05.vcproj +++ b/src/modules/addon/addon_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvilib\file";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ADDON_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ADDON_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/aliaseditor/aliaseditor_QT4_vc05.vcproj b/src/modules/aliaseditor/aliaseditor_QT4_vc05.vcproj index 363125cbf..e801d0c13 100644 --- a/src/modules/aliaseditor/aliaseditor_QT4_vc05.vcproj +++ b/src/modules/aliaseditor/aliaseditor_QT4_vc05.vcproj @@ -63,7 +63,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="qt3support4.lib qtcore4.lib qtgui4.lib qtmain.lib kvilib.lib kvirc.lib" + AdditionalDependencies="qt3support4.lib qtcore4.lib qtgui4.lib qtmain.lib kvilib.lib kvirc.lib" OutputFile="$(OutDir)/kvi$(ProjectName).dll" LinkIncremental="2" AdditionalLibraryDirectories=""$(SSLLIBDIR)";"$(PERLDIR)\lib\CORE";"$(QTDIR)\lib";"$(SolutionDir)\win32build\bin";"$(ZLIBLIBDIR)"" diff --git a/src/modules/dcc/dcc_QT4_vc05.vcproj b/src/modules/dcc/dcc_QT4_vc05.vcproj index 7387cae15..c78bd6f4c 100644 --- a/src/modules/dcc/dcc_QT4_vc05.vcproj +++ b/src/modules/dcc/dcc_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\net";"$(ProjectDir)\..\..\kvilib\core\wstring";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\config";"$(SSLINCDIR)";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DCC_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DCC_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/eventeditor/eventeditor_QT4_vc05.vcproj b/src/modules/eventeditor/eventeditor_QT4_vc05.vcproj index 88d02e30c..d3f080022 100644 --- a/src/modules/eventeditor/eventeditor_QT4_vc05.vcproj +++ b/src/modules/eventeditor/eventeditor_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\net";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EVENTEDITOR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EVENTEDITOR_EXPORTS;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/filetransferwindow/filetransferwindow_QT4_vc05.vcproj b/src/modules/filetransferwindow/filetransferwindow_QT4_vc05.vcproj index fe0ce5f75..63bf750d8 100644 --- a/src/modules/filetransferwindow/filetransferwindow_QT4_vc05.vcproj +++ b/src/modules/filetransferwindow/filetransferwindow_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\net";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FILETRANSFERWINDOW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FILETRANSFERWINDOW_EXPORTS;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -63,7 +63,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="qt3support4.lib qtcore4.lib qtgui4.lib qtmain.lib kvilib.lib kvirc.lib shell32.lib" + AdditionalDependencies="qt3support4.lib qtcore4.lib qtgui4.lib qtmain.lib kvilib.lib shell32.lib kvirc.lib " OutputFile="$(OutDir)/kvi$(ProjectName).dll" LinkIncremental="2" AdditionalLibraryDirectories=""$(SSLLIBDIR)";"$(PERLDIR)\lib\CORE";"$(QTDIR)\lib";"$(SolutionDir)\win32build\bin";"$(ZLIBLIBDIR)"" diff --git a/src/modules/help/help_QT4_vc05.vcproj b/src/modules/help/help_QT4_vc05.vcproj index 7c655e903..533bf2f4a 100644 --- a/src/modules/help/help_QT4_vc05.vcproj +++ b/src/modules/help/help_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\net";"$(ProjectDir)\..\..\kvilib\core\wstring";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\config";"$(SSLINCDIR)";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HELP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HELP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/mediaplayer/winamp_QT4_vc05.vcproj b/src/modules/mediaplayer/winamp_QT4_vc05.vcproj index 9e3a9cb4f..d571c8cd2 100644 --- a/src/modules/mediaplayer/winamp_QT4_vc05.vcproj +++ b/src/modules/mediaplayer/winamp_QT4_vc05.vcproj @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/notifier/notifier_QT4_vc05.vcproj b/src/modules/notifier/notifier_QT4_vc05.vcproj index 93c5fa1f5..abd8d2b75 100644 --- a/src/modules/notifier/notifier_QT4_vc05.vcproj +++ b/src/modules/notifier/notifier_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\net";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NOTIFIER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NOTIFIER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp index 91f8ea6f4..0ce2934d3 100644 --- a/src/modules/objects/class_treewidget.cpp +++ b/src/modules/objects/class_treewidget.cpp @@ -646,5 +646,5 @@ void KviKvsTreeWidget::dropEvent(QDropEvent * e) } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_class_listview.moc" +#include "m_class_treewidget.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp index 7ff677f2f..3d01f61e3 100644 --- a/src/modules/objects/class_treewidgetitem.cpp +++ b/src/modules/objects/class_treewidgetitem.cpp @@ -476,5 +476,5 @@ bool KviKvsObject_treewidgetitem::function_setPixmap(KviKvsObjectFunctionCall *c } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_class_listviewitem.moc" +#include "m_class_treewidgetitem.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/objects/objects.vcproj b/src/modules/objects/objects.vcproj index 20b19aff4..6ac102707 100644 --- a/src/modules/objects/objects.vcproj +++ b/src/modules/objects/objects.vcproj @@ -277,14 +277,6 @@ > </File> <File - RelativePath=".\class_listview.cpp" - > - </File> - <File - RelativePath=".\class_listviewitem.cpp" - > - </File> - <File RelativePath=".\class_mainwindow.cpp" > </File> @@ -349,6 +341,14 @@ > </File> <File + RelativePath=".\class_treewidget.cpp" + > + </File> + <File + RelativePath=".\class_treewidgetitem.cpp" + > + </File> + <File RelativePath=".\class_vbox.cpp" > </File> @@ -416,7 +416,7 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\m_$(InputName).moc" "$(InputDir)\$(InputFileName)"" + CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\m_$(InputName).moc" "$(InputDir)\$(InputFileName)"
" Outputs="$(InputDir)\m_$(InputName).moc" /> </FileConfiguration> @@ -716,7 +716,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_listview.h" + RelativePath=".\class_mainwindow.h" > <FileConfiguration Name="Debug|Win32" @@ -738,7 +738,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_listviewitem.h" + RelativePath=".\class_menubar.h" > <FileConfiguration Name="Debug|Win32" @@ -760,7 +760,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_mainwindow.h" + RelativePath=".\class_multilineedit.h" > <FileConfiguration Name="Debug|Win32" @@ -782,7 +782,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_menubar.h" + RelativePath=".\class_painter.h" > <FileConfiguration Name="Debug|Win32" @@ -804,7 +804,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_multilineedit.h" + RelativePath=".\class_pixmap.h" > <FileConfiguration Name="Debug|Win32" @@ -826,7 +826,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_painter.h" + RelativePath=".\class_popupmenu.h" > <FileConfiguration Name="Debug|Win32" @@ -848,7 +848,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_pixmap.h" + RelativePath=".\class_process.h" > <FileConfiguration Name="Debug|Win32" @@ -870,7 +870,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_popupmenu.h" + RelativePath=".\class_progressbar.h" > <FileConfiguration Name="Debug|Win32" @@ -892,7 +892,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_process.h" + RelativePath=".\class_radiobutton.h" > <FileConfiguration Name="Debug|Win32" @@ -914,7 +914,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_progressbar.h" + RelativePath=".\class_slider.h" > <FileConfiguration Name="Debug|Win32" @@ -936,7 +936,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_radiobutton.h" + RelativePath=".\class_socket.h" > <FileConfiguration Name="Debug|Win32" @@ -958,7 +958,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_slider.h" + RelativePath=".\class_spinbox.h" > <FileConfiguration Name="Debug|Win32" @@ -980,7 +980,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_socket.h" + RelativePath=".\class_tabwidget.h" > <FileConfiguration Name="Debug|Win32" @@ -1002,7 +1002,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_spinbox.h" + RelativePath=".\class_tbrowser.h" > <FileConfiguration Name="Debug|Win32" @@ -1024,7 +1024,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_tabwidget.h" + RelativePath=".\class_toolbar.h" > <FileConfiguration Name="Debug|Win32" @@ -1046,7 +1046,7 @@ </FileConfiguration> </File> <File - RelativePath=".\class_tbrowser.h" + RelativePath=".\class_toolbutton.h" > <FileConfiguration Name="Debug|Win32" @@ -1068,45 +1068,27 @@ </FileConfiguration> </File> <File - RelativePath=".\class_toolbar.h" + RelativePath=".\class_treewidget.h" > <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\m_$(InputName).moc" "$(InputDir)\$(InputFileName)"
" - Outputs="$(InputDir)\m_$(InputName).moc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\m_$(InputName).moc" "$(InputDir)\$(InputFileName)"
" + CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\m_$(InputName).moc" "$(InputDir)\$(InputFileName)"" Outputs="$(InputDir)\m_$(InputName).moc" /> </FileConfiguration> </File> <File - RelativePath=".\class_toolbutton.h" + RelativePath=".\class_treewidgetitem.h" > <FileConfiguration Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\m_$(InputName).moc" "$(InputDir)\$(InputFileName)"
" - Outputs="$(InputDir)\m_$(InputName).moc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\m_$(InputName).moc" "$(InputDir)\$(InputFileName)"
" + CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\m_$(InputName).moc" "$(InputDir)\$(InputFileName)"" Outputs="$(InputDir)\m_$(InputName).moc" /> </FileConfiguration> diff --git a/src/modules/options/options_QT4_vc05.vcproj b/src/modules/options/options_QT4_vc05.vcproj index 52939f9ae..1758e72bc 100644 --- a/src/modules/options/options_QT4_vc05.vcproj +++ b/src/modules/options/options_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvilib\net";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPTIONS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPTIONS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1243,7 +1243,7 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\m_$(InputName).moc" "$(InputDir)\$(InputFileName)"" + CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\m_$(InputName).moc" "$(InputDir)\$(InputFileName)"
" Outputs="$(InputDir)\m_$(InputName).moc" /> </FileConfiguration> diff --git a/src/modules/popupeditor/popupeditor_QT4_vc05.vcproj b/src/modules/popupeditor/popupeditor_QT4_vc05.vcproj index bca238507..9fa36c031 100644 --- a/src/modules/popupeditor/popupeditor_QT4_vc05.vcproj +++ b/src/modules/popupeditor/popupeditor_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\net";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPEDITOR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPEDITOR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/reguser/reguser_QT4_vc05.vcproj b/src/modules/reguser/reguser_QT4_vc05.vcproj index ed1918f8d..ed5ad95b1 100644 --- a/src/modules/reguser/reguser_QT4_vc05.vcproj +++ b/src/modules/reguser/reguser_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="QT3_SUPPORT;WIN32;_DEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -234,6 +234,15 @@ RelativePath=".\dialog.h" > <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
" + Outputs="$(InputDir)\$(InputName).moc" + /> + </FileConfiguration> + <FileConfiguration Name="Release|Win32" > <Tool diff --git a/src/modules/rijndael/rijndael_QT4_vc05.vcproj b/src/modules/rijndael/rijndael_QT4_vc05.vcproj index 5c2a6edd1..1d3b95828 100644 --- a/src/modules/rijndael/rijndael_QT4_vc05.vcproj +++ b/src/modules/rijndael/rijndael_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\net";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;RIJNDAEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;RIJNDAEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/sharedfileswindow/sharedfileswindow_QT4_vc05.vcproj b/src/modules/sharedfileswindow/sharedfileswindow_QT4_vc05.vcproj index 3f72d85f0..de66b2cea 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow_QT4_vc05.vcproj +++ b/src/modules/sharedfileswindow/sharedfileswindow_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\net";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SHAREDFILESWINDOW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SHAREDFILESWINDOW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/theme/theme_QT4_vc05.vcproj b/src/modules/theme/theme_QT4_vc05.vcproj index 14305d3bf..f3b98818b 100644 --- a/src/modules/theme/theme_QT4_vc05.vcproj +++ b/src/modules/theme/theme_QT4_vc05.vcproj @@ -42,8 +42,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\net";"$(ProjectDir)\..\..\kvilib\core\wstring";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\config";"$(SSLINCDIR)";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;STR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + AdditionalIncludeDirectories=""$(ProjectDir)\..\objects\";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\net";"$(ProjectDir)\..\..\kvilib\core\wstring";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\config";"$(SSLINCDIR)";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;STR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -63,10 +63,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="qt3support4.lib qtcore4.lib qtgui4.lib qtmain.lib kvilib.lib kvirc.lib" + AdditionalDependencies="objects.lib qt3support4.lib qtcore4.lib qtgui4.lib qtmain.lib kvilib.lib kvirc.lib" OutputFile="$(OutDir)/kvi$(ProjectName).dll" LinkIncremental="2" - AdditionalLibraryDirectories=""$(SSLLIBDIR)";"$(PERLDIR)\lib\CORE";"$(QTDIR)\lib";"$(SolutionDir)\win32build\bin";"$(ZLIBLIBDIR)"" + AdditionalLibraryDirectories=""$(SolutionDir)\win32build\bin\modules";"$(SSLLIBDIR)";"$(PERLDIR)\lib\CORE";"$(QTDIR)\lib";"$(SolutionDir)\win32build\bin";"$(ZLIBLIBDIR)"" GenerateManifest="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/theme.pdb" diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp index 500c101b0..ea854bce2 100644 --- a/src/modules/torrent/tc_statusbarapplet.cpp +++ b/src/modules/torrent/tc_statusbarapplet.cpp @@ -37,7 +37,9 @@ KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *parent, KviSt { QTimer *timer = new QTimer(this); connect(timer, SIGNAL(timeout()), this, SLOT(update())); - timer->start(250, FALSE); + timer->setInterval(250); + timer->setSingleShot(false); + timer->start(250); // updateDisplay(); // setText("torrent client"); diff --git a/src/modules/torrent/torrent_QT4_vc05.vcproj b/src/modules/torrent/torrent_QT4_vc05.vcproj index f88937e64..1007538b9 100644 --- a/src/modules/torrent/torrent_QT4_vc05.vcproj +++ b/src/modules/torrent/torrent_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\net";"$(ProjectDir)\..\..\kvilib\core\wstring";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\config";"$(SSLINCDIR)";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;STR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;STR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/trayicon/trayicon_QT4_vc05.vcproj b/src/modules/trayicon/trayicon_QT4_vc05.vcproj index 7de4c6c4f..721564b90 100644 --- a/src/modules/trayicon/trayicon_QT4_vc05.vcproj +++ b/src/modules/trayicon/trayicon_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\net";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="QT3_SUPPORT;WIN32;_DEBUG;_WINDOWS;_USRDLL;trayicon_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;trayicon_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/url/url_QT4_vc05.vcproj b/src/modules/url/url_QT4_vc05.vcproj index 220bbc845..9b668a258 100644 --- a/src/modules/url/url_QT4_vc05.vcproj +++ b/src/modules/url/url_QT4_vc05.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\net";"$(ProjectDir)\..\..\kvilib\core\wstring";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\config";"$(SSLINCDIR)";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;URL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;URL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" |