Skip to content

Commit 5c770ca

Browse files
Ri0nRi0n
committed
Reformat code
1 parent c187bf4 commit 5c770ca

File tree

88 files changed

+3445
-3470
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3445
-3470
lines changed

Diff for: ‎CHANGELOG

-1
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,3 @@ New in 0.13
9595
- Ability to permanently trust certificates at connect time.
9696
- Mini command system (Ctrl+7 in chat window).
9797
- Various bugfixes.
98-

Diff for: ‎INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Installation
33

44
-=[ Linux / Unix ]=-
55

6-
For instructions on how to build and install Psi on Unix systems, see
6+
For instructions on how to build and install Psi on Unix systems, see
77
the 'Compiling' section below.
88

99
-=[ Windows ]=-

Diff for: ‎README

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ How you can help
155155
-----------
156156
If you want to help us out, please file a bug report on our tracker at:
157157
https://github.com/psi-im/psi/issues
158-
Please be as descriptive as possible and tell us what exactly you were doing
158+
Please be as descriptive as possible and tell us what exactly you were doing
159159
at the time something went wrong. If possible, send us a stack backtrace.
160160

161161
We also have a XMPP conference [email protected] and

Diff for: ‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,3 @@ If you want to donate some money for development of Psi and Psi+ project, it is
133133
* [Page on Wikipedia](https://en.wikipedia.org/wiki/Psi_\(instant_messaging_client\))
134134

135135
Have fun!
136-

Diff for: ‎Readme-dev-cmake-ru.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
./3rdparty/CMakeLists.txt - собирает статическую библиотеку qhttp
1818
./3rdparty/qite/libqite/libqite.cmake - содержит список файлов проекта qite
19-
19+
2020
./cmake/modules - каталог модулей для поиска библиотек:
2121
./cmake/modulesCOPYING-CMAKE-SCRIPTS - файл лицензии (для решения проблем
2222
с сопровождением)
@@ -60,7 +60,7 @@
6060
Требуется доработка.
6161
***/
6262

63-
./iris/cmake/modules - модули поиска библиотек для iris (копии модулей
63+
./iris/cmake/modules - модули поиска библиотек для iris (копии модулей
6464
из корня)
6565

6666
./iris/src/irisnet/CMakeLists.txt - собирает статическую библиотеку irisnet
@@ -76,7 +76,7 @@
7676
генерирует файл psi_win.rc на основе файла ../win32/psi_win.rc.in и
7777
компилирует psi_win.o
7878
подключает файл src.cmake
79-
подключает файл ../3rdparty/qite/libqite/libqite.cmake
79+
подключает файл ../3rdparty/qite/libqite/libqite.cmake
8080
подключает файл irisprotocol/irisprotocol.cmake
8181
подключает файл protocol/protocol.cmake
8282
подключает файл plugins/plugins.cmake
@@ -166,7 +166,7 @@
166166
./win32/psi_win.rc.in - файл-шаблон для создания файла psi_win.rc
167167

168168
/***
169-
Для удобства опакечивания плагинов, чтобы не тянуть все файлы иходников
169+
Для удобства опакечивания плагинов, чтобы не тянуть все файлы иходников
170170
Psi и не заниматься копированием, если включен флаг INSTALL_PLUGINS_SDK
171171
при сборке и установке клиента Psi средствами CMake-скриптов,
172172
вместе с основными файлами клиента Psi могут быть установлены файлы

Diff for: ‎admin/build/gstbundle_libs_mac

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ libvorbis*.dylib
3030
libvorbisenc*.dylib
3131
libvorbisfile*.dylib
3232
libffi*.dylib
33-
libpcre*.dylib
33+
libpcre*.dylib

Diff for: ‎admin/git_revnumber.sh

-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ if [ ! -z "${1}" ]; then
1111
fi
1212

1313
git rev-list --count ${ref_commit}..HEAD
14-

Diff for: ‎admin/merge_release_to_master.sh

-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ git checkout master
1616
git merge "origin/${1}" --no-ff --no-commit 2>&1 > /dev/null || true
1717
git checkout master . 2>&1 > /dev/null
1818
git commit -a -m "Merge remote-tracking branch 'origin/${1}'"
19-

Diff for: ‎admin/update_iconsets.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ TARGET_DIR=../iconsets
55

66
ROSTER_DEFAULT='crystal-roster'
77
ROSTER_EXTRAS='
8-
crystal-icq crystal-service crystal-yahoo
8+
crystal-icq crystal-service crystal-yahoo
99
crystal-gadu crystal-sms crystal-roster
1010
'
1111

Diff for: ‎admin/update_options_ts.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
import sys
66

77
def rec_parse(node, context): # node : xml.dom.Node
8-
for i in node.childNodes:
9-
if i.nodeType == xml.dom.Node.ELEMENT_NODE:
10-
if i.hasAttribute("comment"):
11-
print('QT_TRANSLATE_NOOP("' + context + '","' + i.getAttribute("comment") + '");');
12-
rec_parse(i,context)
8+
for i in node.childNodes:
9+
if i.nodeType == xml.dom.Node.ELEMENT_NODE:
10+
if i.hasAttribute("comment"):
11+
print('QT_TRANSLATE_NOOP("' + context + '","' + i.getAttribute("comment") + '");');
12+
rec_parse(i,context)
1313

1414

1515
if len(sys.argv) != 2:
16-
print("usage: %s options.xml > output.cpp" % sys.argv[0])
17-
sys.exit(1)
16+
print("usage: %s options.xml > output.cpp" % sys.argv[0])
17+
sys.exit(1)
1818

1919
print("#define QT_TRANSLATE_NOOP(a,b)")
2020

Diff for: ‎cmake/modules/COPYING-CMAKE-SCRIPTS

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ are met:
77
2. Redistributions in binary form must reproduce the copyright
88
notice, this list of conditions and the following disclaimer in the
99
documentation and/or other materials provided with the distribution.
10-
3. The name of the author may not be used to endorse or promote products
10+
3. The name of the author may not be used to endorse or promote products
1111
derived from this software without specific prior written permission.
1212

1313
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

Diff for: ‎cmake/modules/FindEnchant.cmake

+1-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if ( UNIX AND NOT( APPLE OR CYGWIN ) )
5252
endif()
5353
endif()
5454

55-
set ( LIBINCS
55+
set ( LIBINCS
5656
enchant.h
5757
)
5858

@@ -94,4 +94,3 @@ else ()
9494
message(WARNING "No enchant version found. For use enchant-2 library you should set HAVE_ENCHANT2 definition manually")
9595
mark_as_advanced( Enchant_INCLUDE_DIR Enchant_LIBRARY )
9696
endif()
97-

Diff for: ‎cmake/modules/FindHttpParser.cmake

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ find_path(
4040
find_library(
4141
HttpParser_LIBRARY
4242
NAMES http_parser
43-
HINTS
43+
HINTS
4444
${HTTP_PARSER_ROOT}/lib
4545
${HTTP_PARSER_ROOT}/bin
4646
)
@@ -82,4 +82,3 @@ if (HttpParser_FOUND)
8282
endif()
8383

8484
mark_as_advanced( HttpParser_INCLUDE_DIR HttpParser_LIBRARY HttpParser_VERSION )
85-

Diff for: ‎cmake/modules/FindMINIZIP.cmake

+3-4
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ endif ()
3333
if ( UNIX AND NOT( APPLE OR CYGWIN ) )
3434
find_package( PkgConfig QUIET )
3535
pkg_check_modules( PC_MINIZIP QUIET minizip )
36-
set ( MINIZIP_DEFINITIONS
36+
set ( MINIZIP_DEFINITIONS
3737
${PC_MINIZIP_CFLAGS}
3838
${PC_MINIZIP_CFLAGS_OTHER}
3939
)
4040
endif()
4141

42-
set ( LIBINCS
42+
set ( LIBINCS
4343
unzip.h
4444
)
4545

@@ -59,7 +59,7 @@ find_path(
5959
find_library(
6060
MINIZIP_LIBRARY
6161
NAMES minizip
62-
HINTS
62+
HINTS
6363
${PC_MINIZIP_LIBDIR}
6464
${PC_MINIZIP_LIBRARY_DIRS}
6565
${MINIZIP_ROOT}/lib
@@ -78,4 +78,3 @@ if ( MINIZIP_FOUND )
7878
endif()
7979

8080
mark_as_advanced( MINIZIP_INCLUDE_DIR MINIZIP_LIBRARY )
81-

Diff for: ‎cmake/modules/FindQJDns.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ endif()
3636
if ( UNIX AND NOT( APPLE OR CYGWIN ) )
3737
find_package( PkgConfig QUIET )
3838
pkg_check_modules( PC_QJDns QUIET jdns )
39-
set ( QJDns_DEFINITIONS
39+
set ( QJDns_DEFINITIONS
4040
${PC_QJDns_CFLAGS}
4141
${PC_QJDns_CFLAGS_OTHER}
4242
)
4343
endif()
4444

45-
set ( LIBINCS
45+
set ( LIBINCS
4646
qjdns.h
4747
)
4848

@@ -69,7 +69,7 @@ set(QJDns_NAMES
6969
find_library(
7070
QJDns_LIBRARY
7171
NAMES ${QJDns_NAMES}
72-
HINTS
72+
HINTS
7373
${PC_QJDns_LIBDIR}
7474
${PC_QJDns_LIBRARY_DIRS}
7575
${QJDNS_DIR}/lib

Diff for: ‎cmake/modules/FindQJSON.cmake

+3-4
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ endif()
3333
if ( UNIX AND NOT( APPLE OR CYGWIN ) )
3434
find_package( PkgConfig QUIET )
3535
pkg_check_modules( PC_QJSON QUIET QJson )
36-
set ( QJSON_DEFINITIONS
36+
set ( QJSON_DEFINITIONS
3737
${PC_QJSON_CFLAGS}
3838
${PC_QJSON_CFLAGS_OTHER}
3939
)
4040
endif()
4141

42-
set ( LIBINCS
42+
set ( LIBINCS
4343
parser.h
4444
)
4545

@@ -59,7 +59,7 @@ find_path(
5959
find_library(
6060
QJSON_LIBRARY
6161
NAMES qjson
62-
HINTS
62+
HINTS
6363
${PC_QJSON_LIBDIR}
6464
${PC_QJSON_LIBRARY_DIRS}
6565
${QJSON_ROOT}/lib
@@ -78,4 +78,3 @@ if ( QJSON_FOUND )
7878
endif()
7979

8080
mark_as_advanced( QJSON_INCLUDE_DIR QJSON_LIBRARY )
81-

Diff for: ‎cmake/modules/FindQca.cmake

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ find_path(
5353
find_library(
5454
Qca_LIBRARY
5555
NAMES qca-qt5${D}
56-
HINTS
56+
HINTS
5757
${QCA_DIR}/lib
5858
${QCA_DIR}/bin
5959
)
@@ -72,4 +72,3 @@ if (Qca_FOUND)
7272
endif()
7373

7474
mark_as_advanced( Qca_INCLUDE_DIR Qca_LIBRARY )
75-

Diff for: ‎cmake/modules/FindXCB.cmake

+3-4
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ endif ()
3333
if ( UNIX AND NOT( APPLE OR CYGWIN ) )
3434
find_package( PkgConfig QUIET )
3535
pkg_check_modules( PC_XCB QUIET xcb )
36-
set ( XCB_DEFINITIONS
36+
set ( XCB_DEFINITIONS
3737
${PC_XCB_CFLAGS}
3838
${PC_XCB_CFLAGS_OTHER}
3939
)
4040
endif()
4141

42-
set ( LIBINCS
42+
set ( LIBINCS
4343
xcb.h
4444
)
4545

@@ -56,7 +56,7 @@ find_path(
5656
find_library(
5757
XCB_LIBRARY
5858
NAMES xcb
59-
HINTS
59+
HINTS
6060
${PC_XCB_LIBDIR}
6161
${PC_XCB_LIBRARY_DIRS}
6262
${XCB_ROOT}/lib
@@ -75,4 +75,3 @@ if ( XCB_FOUND )
7575
endif()
7676

7777
mark_as_advanced( XCB_INCLUDE_DIR XCB_LIBRARY )
78-

Diff for: ‎doc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.PHONY: all
2-
all:
2+
all:
33

44
.PHONY: api_public
55
api_public:

Diff for: ‎doc/build-mac.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ To simply compile Psi, the same instructions apply as for other *nix
55
platforms:
66
1. First, configure the build using the 'configure' script, optionally
77
adding parameters to specify where to find certain dependencies:
8-
./configure
8+
./configure
99
2. Build the binary:
10-
make
10+
make
1111
After this, the built binary 'psi.app' will be available in src/.
1212
For more details, check 'doc/build-unix.txt'.
1313

1414
To make a distributable copy of your binary, do the following:
1515
1. As above, use configure to configure the build
1616
2. Alter the first lines of 'mac/Makefile' to reflect your setting
17-
3. Run 'make -C mac/'.
17+
3. Run 'make -C mac/'.
1818
This will create a distributable binary 'Psi.app' in 'mac/disk/'.
19-
4. (OPTIONAL) Create a DMG image by running 'make -C mac/ dmg'.
19+
4. (OPTIONAL) Create a DMG image by running 'make -C mac/ dmg'.
2020
This will create a 'Psi-<VERSION>.dmg' file in 'mac/'.
2121
You can create your own DMG template to make the resulting DMG
2222
look different. For more instructions on this, see 'mac/Makefile'.

Diff for: ‎doc/build-unix.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ will need to build and install Qt 4.4 yourself. See the Qt instructions to find
77
out how to do this.
88

99
* You need QCA 2.0 and the QCA OpenSSL plugin, which you can get at
10-
https://userbase.kde.org/QCA
10+
https://userbase.kde.org/QCA
1111
Instructions on how to build these packages can be found below.
1212

1313
The 'Building QCA' and 'Building QCA the OpenSSL plugin' sections can be

Diff for: ‎doc/build-win.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ MingW32 self-installer. All the instructions below are performed from within
66
the Qt command prompt (found in the Start menu)
77

88
* You need QCA 2.0 and the QCA OpenSSL plugin, which you can get at
9-
https://userbase.kde.org/QCA
9+
https://userbase.kde.org/QCA
1010
Instructions on how to build these packages can be found below.
1111

1212
* If you want to use the QCA OpenSSL plugin on Windows, you will need to
1313
download and install the OpenSSL package from
14-
http://www.openssl.org/related/binaries.html
14+
http://www.openssl.org/related/binaries.html
1515

1616
The 'Building QCA' and 'Building QCA the OpenSSL plugin' sections can be
1717
skipped by downloading the sources of these packages, and unpackaging them
@@ -48,7 +48,7 @@ respectively.
4848
to point to the dir where you installed OpenSSL (e.g. C:/OpenSSL).
4949
Change -L$$OPENSSL_PREFIX/lib into -L$$OPENSSL_PREFIX/lib/MingW.
5050

51-
* Run the following commands:
51+
* Run the following commands:
5252

5353
qmake
5454
mingw32-make

0 commit comments

Comments
 (0)