diff options
Diffstat (limited to 'src/modules/objects')
71 files changed, 133 insertions, 133 deletions
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index f686c0187..e65b6b1b9 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -5,7 +5,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -24,10 +24,10 @@ //============================================================================= #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_error.h" #include "kvi_iconmanager.h" -#include "kvi_file.h" +#include "KviFile.h" #include "class_button.h" #include "class_pixmap.h" diff --git a/src/modules/objects/class_button.h b/src/modules/objects/class_button.h index 6043319a1..b25a759be 100644 --- a/src/modules/objects/class_button.h +++ b/src/modules/objects/class_button.h @@ -7,7 +7,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp index 33167c1b8..dfa633eef 100644 --- a/src/modules/objects/class_buttongroup.cpp +++ b/src/modules/objects/class_buttongroup.cpp @@ -27,7 +27,7 @@ #include "class_buttongroup.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QButtonGroup> diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 7c9266ddb..656eebefc 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -5,7 +5,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -26,7 +26,7 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "class_checkbox.h" #include <QCheckBox> diff --git a/src/modules/objects/class_checkbox.h b/src/modules/objects/class_checkbox.h index 9c89e0627..51a727675 100644 --- a/src/modules/objects/class_checkbox.h +++ b/src/modules/objects/class_checkbox.h @@ -8,7 +8,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index d3f194e2a..6624e9544 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -5,7 +5,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -25,7 +25,7 @@ #include "kvi_error.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_debug.h" #include "class_list.h" #include "class_combobox.h" diff --git a/src/modules/objects/class_combobox.h b/src/modules/objects/class_combobox.h index 4fc5a3aee..db7920f16 100644 --- a/src/modules/objects/class_combobox.h +++ b/src/modules/objects/class_combobox.h @@ -8,7 +8,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/objects/class_datetimeedit.cpp b/src/modules/objects/class_datetimeedit.cpp index 4ffdcfa0d..c877c8e71 100644 --- a/src/modules/objects/class_datetimeedit.cpp +++ b/src/modules/objects/class_datetimeedit.cpp @@ -23,10 +23,10 @@ //============================================================================= #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_error.h" #include "kvi_iconmanager.h" -#include "kvi_file.h" +#include "KviFile.h" #include "class_datetimeedit.h" #include "class_pixmap.h" diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp index 63eb78885..b8a665c71 100644 --- a/src/modules/objects/class_dialog.cpp +++ b/src/modules/objects/class_dialog.cpp @@ -4,7 +4,7 @@ // Creation date : Sun Apr 10 22:51:48 CEST 2002 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -25,7 +25,7 @@ #include "class_dialog.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_frame.h" #include "kvi_app.h" diff --git a/src/modules/objects/class_dialog.h b/src/modules/objects/class_dialog.h index 090108bd2..d67cce791 100644 --- a/src/modules/objects/class_dialog.h +++ b/src/modules/objects/class_dialog.h @@ -6,7 +6,7 @@ // Creation date : Sun Apr 10 22:51:48 CEST 2002 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index 592f18b28..d4cd121e6 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -4,7 +4,7 @@ // Creation date : Thu 29 Dec 2005 23:45:11 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2005-2009 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2005-2010 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -25,8 +25,8 @@ #include "class_dockwindow.h" #include "kvi_frame.h" -#include "kvi_locale.h" -#include "kvi_qstring.h" +#include "KviLocale.h" +#include "KviQString.h" #include <QDockWidget> #define QT_DOCK_WINDOW QDockWidget diff --git a/src/modules/objects/class_dockwindow.h b/src/modules/objects/class_dockwindow.h index b81b992fa..f194e4a56 100644 --- a/src/modules/objects/class_dockwindow.h +++ b/src/modules/objects/class_dockwindow.h @@ -6,7 +6,7 @@ // Creation date : Thu 29 Dec 2005 23:45:11 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2005-2009 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2005-2010 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index 8cc190af3..2af376f64 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -5,7 +5,7 @@ // by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor) // // This file is part of the KVirc irc client distribution -// Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -26,10 +26,10 @@ #include "class_file.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_error.h" -#include "kvi_file.h" -#include "kvi_fileutils.h" +#include "KviFile.h" +#include "KviFileUtils.h" #include "class_memorybuffer.h" #include <QStringList> diff --git a/src/modules/objects/class_file.h b/src/modules/objects/class_file.h index 040653c8f..acf4aa324 100644 --- a/src/modules/objects/class_file.h +++ b/src/modules/objects/class_file.h @@ -27,7 +27,7 @@ #include "object_macros.h" #include "class_widget.h" -#include "kvi_file.h" +#include "KviFile.h" class KviKvsObject_file : public KviKvsObject_widget diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/class_ftp.cpp index 9d1c594ac..08a946a5a 100644 --- a/src/modules/objects/class_ftp.cpp +++ b/src/modules/objects/class_ftp.cpp @@ -25,7 +25,7 @@ #include "kvi_debug.h" #include "kvi_error.h" #include "class_ftp.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include <QFtp> #include <QHashIterator> diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index d51603fa6..89c714025 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -28,7 +28,7 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp index 091b7e13d..e224b95ec 100644 --- a/src/modules/objects/class_hbox.cpp +++ b/src/modules/objects/class_hbox.cpp @@ -24,7 +24,7 @@ #define _KVI_DEBUG_CHECK_RANGE_ #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "class_hbox.h" #include "kvi_tal_hbox.h" diff --git a/src/modules/objects/class_http.cpp b/src/modules/objects/class_http.cpp index 5a08a9d8e..a0b682963 100644 --- a/src/modules/objects/class_http.cpp +++ b/src/modules/objects/class_http.cpp @@ -26,7 +26,7 @@ #include "kvi_debug.h" #include "kvi_error.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include <QHttp> #include <QUrl> diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index 641e5bee8..891cb6e63 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -5,7 +5,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -26,7 +26,7 @@ #include "kvi_error.h" #include "kvi_debug.h" #include "class_label.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QFont> diff --git a/src/modules/objects/class_label.h b/src/modules/objects/class_label.h index 929bebe5a..1ff7f0673 100644 --- a/src/modules/objects/class_label.h +++ b/src/modules/objects/class_label.h @@ -7,7 +7,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp index 2c402942a..163d075fe 100644 --- a/src/modules/objects/class_layout.cpp +++ b/src/modules/objects/class_layout.cpp @@ -4,7 +4,7 @@ // Creation date : Fri Now 22 2002 00:50:01 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -24,7 +24,7 @@ #define _KVI_DEBUG_CHECK_RANGE_ #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "class_layout.h" #include <QGridLayout> diff --git a/src/modules/objects/class_layout.h b/src/modules/objects/class_layout.h index 70a62cfe8..a5f5fbff1 100644 --- a/src/modules/objects/class_layout.h +++ b/src/modules/objects/class_layout.h @@ -6,7 +6,7 @@ // Creation date : Fri Now 22 2002 00:50:01 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp index d04c304bf..e1f570bfc 100644 --- a/src/modules/objects/class_lcd.cpp +++ b/src/modules/objects/class_lcd.cpp @@ -26,7 +26,7 @@ #include "class_lcd.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QLCDNumber> diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index 3b971e4ff..59b20760e 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -5,7 +5,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -25,7 +25,7 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "class_lineedit.h" #include <QRegExpValidator> #include <QLineEdit> diff --git a/src/modules/objects/class_lineedit.h b/src/modules/objects/class_lineedit.h index 755837da9..b920d4187 100644 --- a/src/modules/objects/class_lineedit.h +++ b/src/modules/objects/class_lineedit.h @@ -7,7 +7,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/objects/class_list.cpp b/src/modules/objects/class_list.cpp index 298e77dc9..f4d1475c0 100644 --- a/src/modules/objects/class_list.cpp +++ b/src/modules/objects/class_list.cpp @@ -4,7 +4,7 @@ // Creation date : Wed Sep 09 2000 21:07:55 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -23,8 +23,8 @@ //============================================================================ #include "kvi_debug.h" -#include "kvi_malloc.h" -#include "kvi_locale.h" +#include "KviMemory.h" +#include "KviLocale.h" #include "class_list.h" #include <stdlib.h> diff --git a/src/modules/objects/class_list.h b/src/modules/objects/class_list.h index 3d583f254..6354f74fe 100644 --- a/src/modules/objects/class_list.h +++ b/src/modules/objects/class_list.h @@ -6,7 +6,7 @@ // Creation date : Wed Sep 09 2000 21:07:01 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -25,8 +25,8 @@ //============================================================================= #include "kvi_settings.h" -#include "kvi_string.h" -#include "kvi_pointerlist.h" +#include "KviCString.h" +#include "KviPointerList.h" #include "kvi_kvs_variant.h" #include "object_macros.h" diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp index 6cb063d14..a3e7819aa 100644 --- a/src/modules/objects/class_listwidget.cpp +++ b/src/modules/objects/class_listwidget.cpp @@ -4,7 +4,7 @@ // Creation date : Sat Oct 2 03:40:28 CET 2004 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2004-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -23,7 +23,7 @@ //============================================================================= #include "kvi_error.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_debug.h" #include "class_list.h" #include "class_listwidget.h" diff --git a/src/modules/objects/class_listwidget.h b/src/modules/objects/class_listwidget.h index 90aa25e51..f6f9aa0c7 100644 --- a/src/modules/objects/class_listwidget.h +++ b/src/modules/objects/class_listwidget.h @@ -6,7 +6,7 @@ // Creation date : Sat Oct 2 03:40:28 CET 2004 by Szymon Stefanek
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2004-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp index a61d55667..5621b87c1 100644 --- a/src/modules/objects/class_mainwindow.cpp +++ b/src/modules/objects/class_mainwindow.cpp @@ -27,7 +27,7 @@ #include "class_mainwindow.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp index 66aa4d0a8..22836afa7 100644 --- a/src/modules/objects/class_memorybuffer.cpp +++ b/src/modules/objects/class_memorybuffer.cpp @@ -28,10 +28,10 @@ #include "kvi_error.h" #include "kvi_debug.h" #include "kvi_settings.h" -#include "kvi_locale.h" -#include "kvi_process.h" -#include "kvi_fileutils.h" -#include "kvi_file.h" +#include "KviLocale.h" +#include "QProcess" +#include "KviFileUtils.h" +#include "KviFile.h" #include <QFileInfo> diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp index 3e726918f..85468613f 100644 --- a/src/modules/objects/class_menubar.cpp +++ b/src/modules/objects/class_menubar.cpp @@ -4,7 +4,7 @@ // Creation date : Tue Now 26 13:16:59 CEST 2002 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -26,7 +26,7 @@ #include "class_menubar.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" /* @doc: menubar diff --git a/src/modules/objects/class_menubar.h b/src/modules/objects/class_menubar.h index 7e842e670..6b8002c35 100644 --- a/src/modules/objects/class_menubar.h +++ b/src/modules/objects/class_menubar.h @@ -6,7 +6,7 @@ // Creation date : Tue Now 26 13:15:48 CEST 2002 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index 88984b1ac..cbb235efb 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -25,8 +25,8 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" -#include "kvi_malloc.h" +#include "KviLocale.h" +#include "KviMemory.h" #include <QTextBlock> #include <QFile> diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index ece9586fa..0bc604595 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -29,10 +29,10 @@ #include "class_widget.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_error.h" #include "kvi_iconmanager.h" -#include "kvi_malloc.h" +#include "KviMemory.h" #include <QPrintDialog> #include <QTextDocument> #include <QIcon> diff --git a/src/modules/objects/class_painter.h b/src/modules/objects/class_painter.h index f0752323b..9af8f9f90 100644 --- a/src/modules/objects/class_painter.h +++ b/src/modules/objects/class_painter.h @@ -29,7 +29,7 @@ #include <qpainter.h> #include <qpaintdevice.h> -#include "kvi_string.h" +#include "KviCString.h" #include <QPainterPath> #include "object_macros.h" diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index 827ca14db..a509884af 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -27,10 +27,10 @@ #include "class_widget.h" #include "class_memorybuffer.h" -#include "kvi_animatedpixmap.h" +#include "KviAnimatedPixmap.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include <QFile> diff --git a/src/modules/objects/class_pixmap.h b/src/modules/objects/class_pixmap.h index 485f32e5b..07e46822a 100644 --- a/src/modules/objects/class_pixmap.h +++ b/src/modules/objects/class_pixmap.h @@ -30,8 +30,8 @@ #include <qpixmap.h> #include <qimage.h> #include <QMatrix> -#include <kvi_animatedpixmap.h> -#include "kvi_string.h" +#include <KviAnimatedPixmap.h> +#include "KviCString.h" #include "object_macros.h" diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index 86ff5003e..013fa945e 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -28,7 +28,7 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include "kvi_tal_popupmenu.h" diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index 07bf9ee53..b150fa8af 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -27,8 +27,8 @@ #include "kvi_error.h" #include "kvi_debug.h" #include "kvi_settings.h" -#include "kvi_locale.h" -#include "kvi_process.h" +#include "KviLocale.h" +#include "QProcess" /* @doc: process @@ -182,7 +182,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_process,"process","object") KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_process,KviKvsObject) - m_pProcess = new KviProcess(); + m_pProcess = new QProcess(); connect(m_pProcess,SIGNAL(readyReadStandardOutput()),this,SLOT(slotReadStdout())); connect(m_pProcess,SIGNAL(readyReadStandardError()),this,SLOT(slotReadStderr())); @@ -216,7 +216,7 @@ KVSO_CLASS_FUNCTION(process,startProcess) szcmd = m_szArgs.takeFirst(); m_pProcess->start(szcmd, m_szArgs); - if(m_pProcess->state()==KviProcess::NotRunning) + if(m_pProcess->state()==QProcess::NotRunning) { c->warning( __tr2qs_ctx("Process could not be started.","objects")); } @@ -287,21 +287,21 @@ KVSO_CLASS_FUNCTION(process,tryTerminate) KVSO_CLASS_FUNCTION(process,closeStdin) { CHECK_INTERNAL_POINTER(m_pProcess) - m_pProcess->closeReadChannel(KviProcess::StandardOutput); + m_pProcess->closeReadChannel(QProcess::StandardOutput); return true; } //->Returns if the process still runnig KVSO_CLASS_FUNCTION(process,isRunning) { CHECK_INTERNAL_POINTER(m_pProcess) - c->returnValue()->setBoolean(m_pProcess->state()==KviProcess::Running); + c->returnValue()->setBoolean(m_pProcess->state()==QProcess::Running); return true; } //->Returns if the process exited. KVSO_CLASS_FUNCTION(process,normalExit) { CHECK_INTERNAL_POINTER(m_pProcess) - c->returnValue()->setBoolean(m_pProcess->state()==KviProcess::NotRunning && m_pProcess->exitStatus()==KviProcess::NormalExit); + c->returnValue()->setBoolean(m_pProcess->state()==QProcess::NotRunning && m_pProcess->exitStatus()==QProcess::NormalExit); return true; } diff --git a/src/modules/objects/class_process.h b/src/modules/objects/class_process.h index 8293f30aa..a3a808850 100644 --- a/src/modules/objects/class_process.h +++ b/src/modules/objects/class_process.h @@ -31,7 +31,7 @@ #include "object_macros.h" -#include "kvi_process.h" +#include "QProcess" class KviKvsObject_process : public KviKvsObject @@ -40,7 +40,7 @@ class KviKvsObject_process : public KviKvsObject public: KVSO_DECLARE_OBJECT(KviKvsObject_process) protected: - KviProcess * m_pProcess; + QProcess * m_pProcess; private: QStringList m_szArgs; public: diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp index 60c278663..e88e9f8d1 100644 --- a/src/modules/objects/class_progressbar.cpp +++ b/src/modules/objects/class_progressbar.cpp @@ -27,7 +27,7 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QProgressBar> diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index fe2629153..e3287184f 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -26,7 +26,7 @@ #include "class_radiobutton.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QRadioButton> diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index 0bd1ca8ff..caca558a6 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -26,7 +26,7 @@ #include "class_slider.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QSlider> diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 0d2034be5..e35c62654 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -4,7 +4,7 @@ // Creation date : Sun Nov 11 03:13:45 2001 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2001-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -27,22 +27,22 @@ #include "class_file.h" #include "kvi_settings.h" -#include "kvi_qstring.h" +#include "KviQString.h" #define _KVI_DEBUG_CHECK_RANGE_ #include "kvi_debug.h" -#include "kvi_file.h" -#include "kvi_fileutils.h" -#include "kvi_locale.h" +#include "KviFile.h" +#include "KviFileUtils.h" +#include "KviLocale.h" #include "kvi_error.h" #include "kvi_netutils.h" #include "kvi_dns.h" #include "kvi_error.h" #include "kvi_socket.h" -#include "kvi_malloc.h" +#include "KviMemory.h" #include "kvi_memmove.h" -#include "kvi_databuffer.h" +#include "KviDataBuffer.h" #include <QByteArray> @@ -316,7 +316,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_socket) m_pFlushTimer=0; - if(m_pInBuffer)kvi_free(m_pInBuffer); + if(m_pInBuffer)KviMemory::free(m_pInBuffer); if(m_pDelayTimer)delete m_pDelayTimer; if(m_pDns)delete m_pDns; if(m_pSn)delete m_pSn; @@ -1099,7 +1099,7 @@ void KviKvsObject_socket::readNotifierFired(int) { m_uInBufferLen += KVI_IN_BUFFER_ALLOC_CHUNK; //m_pInBuffer->resize(m_uInBufferLen); - m_pInBuffer = (char *)kvi_realloc(m_pInBuffer,m_uInBufferLen); + m_pInBuffer = (char *)KviMemory::reallocate(m_pInBuffer,m_uInBufferLen); } //int readLength = kvi_socket_recv(m_sock,m_pInBuffer->data() + m_uInDataLen,KVI_READ_CHUNK); @@ -1179,7 +1179,7 @@ void KviKvsObject_socket::eatInData(unsigned int uLen) if(uSpace > KVI_IN_BUFFER_ALLOC_CHUNK) { m_uInBufferLen -= KVI_IN_BUFFER_ALLOC_CHUNK; - m_pInBuffer = (char *)kvi_realloc(m_pInBuffer,m_uInBufferLen); + m_pInBuffer = (char *)KviMemory::reallocate(m_pInBuffer,m_uInBufferLen); } } @@ -1259,7 +1259,7 @@ void KviKvsObject_socket::reset() } if(m_pInBuffer) { - kvi_free(m_pInBuffer); + KviMemory::free(m_pInBuffer); m_pInBuffer = 0; } if(m_secondarySock) diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h index 191ce4699..a4e252693 100644 --- a/src/modules/objects/class_socket.h +++ b/src/modules/objects/class_socket.h @@ -25,7 +25,7 @@ //============================================================================= #include "kvi_socket.h" -#include "kvi_pointerlist.h" +#include "KviPointerList.h" #include <QSocketNotifier> #include <QTimer> diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index b110eeaea..3c27baa08 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -26,7 +26,7 @@ #include "class_spinbox.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QSpinBox> diff --git a/src/modules/objects/class_sql.cpp b/src/modules/objects/class_sql.cpp index 68bf04766..6a34589cc 100644 --- a/src/modules/objects/class_sql.cpp +++ b/src/modules/objects/class_sql.cpp @@ -4,7 +4,7 @@ // Creation date : Wed Gen 28 2009 21:07:55 by Alessandro Carbone // // This file is part of the KVirc irc client distribution -// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -23,8 +23,8 @@ //============================================================================ #include "kvi_debug.h" -#include "kvi_malloc.h" -#include "kvi_locale.h" +#include "KviMemory.h" +#include "KviLocale.h" #include "class_sql.h" #include <QtSql> #include "class_memorybuffer.h" diff --git a/src/modules/objects/class_sql.h b/src/modules/objects/class_sql.h index 0604ad99b..2b848ca97 100644 --- a/src/modules/objects/class_sql.h +++ b/src/modules/objects/class_sql.h @@ -6,7 +6,7 @@ // Creation date : Wed Gen 28 2009 21:07:55 by Alessandro Carbone // // This file is part of the KVirc irc client distribution -// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -25,8 +25,8 @@ //============================================================================= #include "kvi_settings.h" -#include "kvi_string.h" -#include "kvi_pointerlist.h" +#include "KviCString.h" +#include "KviPointerList.h" #include "kvi_kvs_variant.h" #include "object_macros.h" #include <QtSql> diff --git a/src/modules/objects/class_tablewidget.cpp b/src/modules/objects/class_tablewidget.cpp index 60dc9bc34..c8862cb4a 100644 --- a/src/modules/objects/class_tablewidget.cpp +++ b/src/modules/objects/class_tablewidget.cpp @@ -4,7 +4,7 @@ // Creation date : Wed 04 Feb 2009 09:30:05 CEST by Carbone Alessandro // // This file is part of the KVirc irc client distribution -// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -28,10 +28,10 @@ #include "kvi_debug.h" #include "kvi_app.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_error.h" #include "kvi_iconmanager.h" -#include "kvi_file.h" +#include "KviFile.h" #include "kvi_kvs_arraycast.h" #include <QTableWidget> diff --git a/src/modules/objects/class_tablewidget.h b/src/modules/objects/class_tablewidget.h index f2bf20fc6..9b76fbdcb 100644 --- a/src/modules/objects/class_tablewidget.h +++ b/src/modules/objects/class_tablewidget.h @@ -7,7 +7,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index b2210654e..40041e02c 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -26,7 +26,7 @@ #include "class_tabwidget.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QTabWidget> diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index c73c9d5a3..f781b68bd 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -27,7 +27,7 @@ #include "class_tbrowser.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QTextBrowser> diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index 3abadede5..b650d38b8 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -28,7 +28,7 @@ #include "kvi_debug.h" #include "kvi_tal_toolbar.h" #include "kvi_tal_mainwindow.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include "class_mainwindow.h" diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 5c890ba63..0de288057 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -27,7 +27,7 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include "kvi_tal_popupmenu.h" /* diff --git a/src/modules/objects/class_trayicon.cpp b/src/modules/objects/class_trayicon.cpp index f95251776..9f6b563ca 100644 --- a/src/modules/objects/class_trayicon.cpp +++ b/src/modules/objects/class_trayicon.cpp @@ -27,7 +27,7 @@ #include "kvi_iconmanager.h" #include "kvi_debug.h" #include "kvi_error.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include <QSystemTrayIcon> diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp index f06868651..1a0a21973 100644 --- a/src/modules/objects/class_treewidget.cpp +++ b/src/modules/objects/class_treewidget.cpp @@ -27,7 +27,7 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QTreeWidget> diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp index a1641ee37..62e1a2b54 100644 --- a/src/modules/objects/class_treewidgetitem.cpp +++ b/src/modules/objects/class_treewidgetitem.cpp @@ -28,7 +28,7 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QIcon> diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp index 653f43d2c..5ac157775 100644 --- a/src/modules/objects/class_vbox.cpp +++ b/src/modules/objects/class_vbox.cpp @@ -25,7 +25,7 @@ #define _KVI_DEBUG_CHECK_RANGE_ #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "class_vbox.h" diff --git a/src/modules/objects/class_vbox.h b/src/modules/objects/class_vbox.h index 98763d94f..34ed0a0f1 100644 --- a/src/modules/objects/class_vbox.h +++ b/src/modules/objects/class_vbox.h @@ -25,7 +25,7 @@ // //============================================================================= -#include "kvi_string.h" +#include "KviCString.h" #include "class_widget.h" #include "object_macros.h" diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 5a67a4e44..d6bda1561 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -5,7 +5,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -26,10 +26,10 @@ #include "class_widget.h" #include "class_pixmap.h" -#include "kvi_malloc.h" +#include "KviMemory.h" #include "kvi_debug.h" #include "kvi_error.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include "kvi_window.h" #include "kvi_app.h" diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h index c114c8b77..f2575793c 100644 --- a/src/modules/objects/class_widget.h +++ b/src/modules/objects/class_widget.h @@ -7,7 +7,7 @@ // // This file is part of the KVirc irc client distribution // Copyright (C) 2000 Krzysztof Godlewski -// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -26,7 +26,7 @@ //============================================================================= #include "kvi_settings.h" -#include "kvi_string.h" +#include "KviCString.h" #include "kvi_tal_tooltip.h" #include "object_macros.h" diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index 05235fb87..9c1dfc57d 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -4,7 +4,7 @@ // Creation date : Tue Now 26 21:39:59 CEST 2002 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -28,7 +28,7 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_frame.h" diff --git a/src/modules/objects/class_window.h b/src/modules/objects/class_window.h index 036608955..479f5d01a 100644 --- a/src/modules/objects/class_window.h +++ b/src/modules/objects/class_window.h @@ -6,7 +6,7 @@ // Creation date : Tue Nov 26 21:37:48 CEST 2002 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index 905608caf..5d7d5559e 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -29,7 +29,7 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include <QPushButton> diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp index 39c3632c5..926731fc3 100644 --- a/src/modules/objects/class_workspace.cpp +++ b/src/modules/objects/class_workspace.cpp @@ -27,7 +27,7 @@ #include "class_workspace.h" #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include <QMdiArea> diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 2de6e9b77..3c48afb82 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -27,7 +27,7 @@ #include "kvi_error.h" #include "kvi_debug.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_iconmanager.h" #include "class_widget.h" diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index 1b0ad7a6b..f8eb6a5bb 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -4,7 +4,7 @@ // Created on Tue 27 Dec 2005 00:14:09 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2005-2010 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -24,12 +24,12 @@ #include "class_xmlreader.h" #include "class_memorybuffer.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_kvs_variantlist.h" #include "kvi_kvs_hash.h" -#include "kvi_qstring.h" +#include "KviQString.h" /* diff --git a/src/modules/objects/class_xmlreader.h b/src/modules/objects/class_xmlreader.h index ea2d9cafc..eddad1d38 100644 --- a/src/modules/objects/class_xmlreader.h +++ b/src/modules/objects/class_xmlreader.h @@ -6,7 +6,7 @@ // Created on Tue 27 Dec 2005 00:14:09 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2005-2010 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -25,7 +25,7 @@ //============================================================================= #include "kvi_settings.h" -#include "kvi_qstring.h" +#include "KviQString.h" #include "object_macros.h" diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 178a495af..32014b689 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -4,7 +4,7 @@ // Creation date : Wed Sep 09 2000 20:59:01 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -74,15 +74,15 @@ #include "kvi_iconmanager.h" #include "kvi_window.h" #include "kvi_out.h" -#include "kvi_mirccntrl.h" +#include "KviMircCntrl.h" #include "kvi_app.h" #include "kvi_module.h" -#include "kvi_locale.h" +#include "KviLocale.h" #include "kvi_error.h" -#include "kvi_cmdformatter.h" +#include "KviCommandFormatter.h" #include "kvi_out.h" #include "kvi_app.h" -#include "kvi_fileutils.h" +#include "KviFileUtils.h" #include <QDir> #include <QImage> @@ -656,7 +656,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd) if (bFlag) cmd->window()->output(80, "Objects dump:"); QWidgetList list = g_pApp->topLevelWidgets(); - KviStr spacing = ">"; + KviCString spacing = ">"; QString szTemp; KviKvsArray * n = new KviKvsArray(); int idx=0; diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h index 4ef19acbd..66bd57374 100644 --- a/src/modules/objects/object_macros.h +++ b/src/modules/objects/object_macros.h @@ -6,7 +6,7 @@ // Creation date : Sat Jun 18 2005 15:32:01 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2005-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License |