From f2f47c5eaa7d284abad1f693d7c75c85c42565df Mon Sep 17 00:00:00 2001 From: Szymon Tomasz Stefanek Date: Sat, 25 Dec 2010 05:28:46 +0000 Subject: Beginning of 'the big rename & cleanup'. File names should match class names, when possible. Move classes to one per file. Move C functions to namespaces, if possible. Kill some abbreviations... git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5229 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/theme/libkvitheme.cpp | 20 ++++++++++---------- src/modules/theme/managementdialog.cpp | 10 +++++----- src/modules/theme/managementdialog.h | 4 ++-- src/modules/theme/packthemedialog.cpp | 12 ++++++------ src/modules/theme/packthemedialog.h | 4 ++-- src/modules/theme/savethemedialog.cpp | 12 ++++++------ src/modules/theme/savethemedialog.h | 4 ++-- src/modules/theme/themefunctions.cpp | 8 ++++---- src/modules/theme/themefunctions.h | 4 ++-- 9 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src/modules/theme') diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp index dff7d4f05..2ba30a640 100644 --- a/src/modules/theme/libkvitheme.cpp +++ b/src/modules/theme/libkvitheme.cpp @@ -4,7 +4,7 @@ // Creation date : Sat 30 Dec 2006 14:54:56 by Szymon Stefanek // // This toolbar is part of the KVirc irc client distribution -// Copyright (C) 2006-2008 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2006-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,17 +27,17 @@ #include "kvi_msgbox.h" #include "kvi_module.h" -#include "kvi_locale.h" -#include "kvi_qstring.h" -#include "kvi_parameterlist.h" -#include "kvi_cmdformatter.h" +#include "KviLocale.h" +#include "KviQString.h" +#include "KviParameterList.h" +#include "KviCommandFormatter.h" #include "kvi_error.h" #include "kvi_out.h" #include "kvi_iconmanager.h" -#include "kvi_mirccntrl.h" -#include "kvi_config.h" +#include "KviMircCntrl.h" +#include "KviConfigurationFile.h" #include "kvi_sourcesdate.h" -#include "kvi_fileutils.h" +#include "KviFileUtils.h" #include "kvi_filedialog.h" #include "kvi_theme.h" @@ -289,7 +289,7 @@ static bool theme_module_init(KviModule *m) QString szBuf; m->getDefaultConfigFileName(szBuf); - KviConfig cfg(szBuf,KviConfig::Read); + KviConfigurationFile cfg(szBuf,KviConfigurationFile::Read); g_rectManagementDialogGeometry = cfg.readRectEntry("EditorGeometry",QRect(10,10,390,440)); return true; @@ -301,7 +301,7 @@ static bool theme_module_cleanup(KviModule *m) QString szBuf; m->getDefaultConfigFileName(szBuf); - KviConfig cfg(szBuf,KviConfig::Write); + KviConfigurationFile cfg(szBuf,KviConfigurationFile::Write); cfg.writeEntry("EditorGeometry",g_rectManagementDialogGeometry); return true; diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index 85ec9d231..49116bcc8 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -4,7 +4,7 @@ // Creation date : Sat 30 Dec 2006 14:54:56 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2006-2008 Szymon Stefanek +// Copyright (C) 2006-2010 Szymon Stefanek // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -28,14 +28,14 @@ #include "themefunctions.h" #include "kvi_options.h" -#include "kvi_locale.h" -#include "kvi_config.h" -#include "kvi_fileutils.h" +#include "KviLocale.h" +#include "KviConfigurationFile.h" +#include "KviFileUtils.h" #include "kvi_app.h" #include "kvi_frame.h" #include "kvi_iconmanager.h" #include "kvi_internalcmd.h" -#include "kvi_packagefile.h" +#include "KviPackageFile.h" #include "kvi_fileextensions.h" #include "kvi_filedialog.h" #include "kvi_dynamictooltip.h" diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h index 88bb670e3..3df640222 100644 --- a/src/modules/theme/managementdialog.h +++ b/src/modules/theme/managementdialog.h @@ -6,7 +6,7 @@ // Creation date : Sat 30 Dec 2006 14:54:56 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2006-2008 Szymon Stefanek +// Copyright (C) 2006-2010 Szymon Stefanek // // 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_optionswidget.h" -#include "kvi_pointerlist.h" +#include "KviPointerList.h" #include "kvi_theme.h" #include "kvi_tal_popupmenu.h" #include "kvi_tal_wizard.h" diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp index b715bb00b..4a4c83440 100644 --- a/src/modules/theme/packthemedialog.cpp +++ b/src/modules/theme/packthemedialog.cpp @@ -4,7 +4,7 @@ // Creation date : Wed 03 Jan 2007 01:11:44 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2007-2008 Szymon Stefanek +// Copyright (C) 2007-2010 Szymon Stefanek // Copyright (C) 2010 Elvio Basello // // This program is FREE software. You can redistribute it and/or @@ -27,18 +27,18 @@ #include "themefunctions.h" #include "kvi_options.h" -#include "kvi_locale.h" -#include "kvi_config.h" -#include "kvi_fileutils.h" +#include "KviLocale.h" +#include "KviConfigurationFile.h" +#include "KviFileUtils.h" #include "kvi_app.h" #include "kvi_frame.h" #include "kvi_iconmanager.h" -#include "kvi_packagefile.h" +#include "KviPackageFile.h" #include "kvi_fileextensions.h" #include "kvi_filedialog.h" //#include "kvi_msgbox.h" #include "kvi_selectors.h" -#include "kvi_miscutils.h" +#include "KviMiscUtils.h" #include "kvi_sourcesdate.h" #include diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/packthemedialog.h index b88939f48..ecbeb4c0a 100644 --- a/src/modules/theme/packthemedialog.h +++ b/src/modules/theme/packthemedialog.h @@ -6,7 +6,7 @@ // Creation date : Wed 03 Jan 2007 01:11:44 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2007-2008 Szymon Stefanek +// Copyright (C) 2007-2010 Szymon Stefanek // Copyright (C) 2010 Elvio Basello // // This program is FREE software. You can redistribute it and/or @@ -26,7 +26,7 @@ //============================================================================= #include "kvi_settings.h" -#include "kvi_pointerlist.h" +#include "KviPointerList.h" #include "kvi_theme.h" #include diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp index fc8f3d256..578e19b6d 100644 --- a/src/modules/theme/savethemedialog.cpp +++ b/src/modules/theme/savethemedialog.cpp @@ -4,7 +4,7 @@ // Creation date : Wed 03 Jan 2007 03:01:34 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2007-2008 Szymon Stefanek +// Copyright (C) 2007-2010 Szymon Stefanek // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -26,18 +26,18 @@ #include "themefunctions.h" #include "kvi_options.h" -#include "kvi_locale.h" -#include "kvi_config.h" -#include "kvi_fileutils.h" +#include "KviLocale.h" +#include "KviConfigurationFile.h" +#include "KviFileUtils.h" #include "kvi_app.h" #include "kvi_frame.h" #include "kvi_iconmanager.h" -#include "kvi_packagefile.h" +#include "KviPackageFile.h" #include "kvi_fileextensions.h" #include "kvi_filedialog.h" #include "kvi_msgbox.h" #include "kvi_selectors.h" -#include "kvi_miscutils.h" +#include "KviMiscUtils.h" #include "kvi_sourcesdate.h" #include diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h index 99b9529d5..145ffdcbf 100644 --- a/src/modules/theme/savethemedialog.h +++ b/src/modules/theme/savethemedialog.h @@ -6,7 +6,7 @@ // Creation date : Wed 03 Jan 2007 03:01:34 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2007-2008 Szymon Stefanek +// Copyright (C) 2007-2010 Szymon Stefanek // // 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_pointerlist.h" +#include "KviPointerList.h" #include "kvi_theme.h" #include "kvi_tal_wizard.h" diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp index a1a39a991..b14d5b5c8 100644 --- a/src/modules/theme/themefunctions.cpp +++ b/src/modules/theme/themefunctions.cpp @@ -4,7 +4,7 @@ // Creation date : Wed 03 Jan 2007 03:14:07 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2007-2008 Szymon Stefanek +// Copyright (C) 2007-2010 Szymon Stefanek // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -24,13 +24,13 @@ #include "themefunctions.h" -#include "kvi_packagefile.h" -#include "kvi_locale.h" +#include "KviPackageFile.h" +#include "KviLocale.h" #include "kvi_msgbox.h" #include "kvi_app.h" #include "kvi_htmldialog.h" #include "kvi_iconmanager.h" -#include "kvi_miscutils.h" +#include "KviMiscUtils.h" #include "kvi_sourcesdate.h" #include "kvi_theme.h" #include "kvi_frame.h" diff --git a/src/modules/theme/themefunctions.h b/src/modules/theme/themefunctions.h index dd29fe4bd..0aabab805 100644 --- a/src/modules/theme/themefunctions.h +++ b/src/modules/theme/themefunctions.h @@ -6,7 +6,7 @@ // Creation date : Wed 03 Jan 2007 03:14:07 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution -// Copyright (C) 2007-2008 Szymon Stefanek +// Copyright (C) 2007-2010 Szymon Stefanek // // 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 "kvi_htmldialog.h" #include -- cgit v1.3.1-10-gc9f91