summaryrefslogtreecommitdiff
authorchicken <chicken>2004-03-01 20:00:34 (UTC)
committer chicken <chicken>2004-03-01 20:00:34 (UTC)
commit6bab4a28785c4ab5b0f0707c8c8db953e399cac8 (patch) (unidiff)
tree126dd6c09cc82b3d41ea70410803daac5cde5b60
parent4ffae5ecb25f6d640c69f53f02755b6ec58d4c98 (diff)
downloadopie-6bab4a28785c4ab5b0f0707c8c8db953e399cac8.zip
opie-6bab4a28785c4ab5b0f0707c8c8db953e399cac8.tar.gz
opie-6bab4a28785c4ab5b0f0707c8c8db953e399cac8.tar.bz2
fix includes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/libkate/document/katedocument.cpp2
-rw-r--r--noncore/apps/tinykate/libkate/kateconfig.cpp2
-rw-r--r--noncore/apps/tinykate/libkate/view/kateview.cpp9
-rw-r--r--noncore/apps/tinykate/libkate/view/kateviewdialog.cpp4
-rw-r--r--noncore/apps/tinykate/tinykate.cpp5
-rw-r--r--noncore/apps/zsafe/category.cpp1
-rw-r--r--noncore/apps/zsafe/main.cpp1
-rwxr-xr-xnoncore/apps/zsafe/qsettings.cpp1
-rw-r--r--noncore/apps/zsafe/scqtfiledlg.cpp5
-rw-r--r--noncore/apps/zsafe/scqtfileedit.cpp4
-rw-r--r--noncore/apps/zsafe/zlistview.cpp2
-rw-r--r--noncore/apps/zsafe/zsafe.cpp1
-rw-r--r--noncore/comm/keypebble/krfbbuffer.cpp3
-rw-r--r--noncore/comm/keypebble/krfbcanvas.cpp9
-rw-r--r--noncore/comm/keypebble/krfbconnection.cpp1
-rw-r--r--noncore/comm/keypebble/krfbdecoder.cpp6
-rw-r--r--noncore/comm/keypebble/krfblogin.cpp1
-rw-r--r--noncore/comm/keypebble/krfbserver.cpp1
-rw-r--r--noncore/comm/keypebble/kvnc.cpp13
-rw-r--r--noncore/comm/keypebble/kvncbookmarkdlg.cpp14
-rw-r--r--noncore/comm/keypebble/kvncconndlg.cpp8
-rw-r--r--noncore/comm/keypebble/main.cpp1
-rw-r--r--noncore/comm/mobilemsg/mobilemsg.cpp5
-rw-r--r--noncore/decorations/liquid/liquid.cpp2
24 files changed, 2 insertions, 99 deletions
diff --git a/noncore/apps/tinykate/libkate/document/katedocument.cpp b/noncore/apps/tinykate/libkate/document/katedocument.cpp
index 6807544..f05e21a 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katedocument.cpp
@@ -1,116 +1,114 @@
1/*************************************************************************** 1/***************************************************************************
2 katedocument.cpp - description 2 katedocument.cpp - description
3 ------------------- 3 -------------------
4 begin : Mon Jan 15 2001 4 begin : Mon Jan 15 2001
5 copyright : (C) 2001 by Christoph "Crossfire" Cullmann 5 copyright : (C) 2001 by Christoph "Crossfire" Cullmann
6 (C) 2002 by Joseph Wenninger 6 (C) 2002 by Joseph Wenninger
7 email : crossfire@babylon2k.de 7 email : crossfire@babylon2k.de
8 jowenn@kde.org 8 jowenn@kde.org
9 9
10***************************************************************************/ 10***************************************************************************/
11 11
12/*************************************************************************** 12/***************************************************************************
13 * * 13 * *
14 * This program is free software; you can redistribute it and/or modify * 14 * This program is free software; you can redistribute it and/or modify *
15 * it under the terms of the GNU General Public License as published by * 15 * it under the terms of the GNU General Public License as published by *
16 * the Free Software Foundation; either version 2 of the License, or * 16 * the Free Software Foundation; either version 2 of the License, or *
17 * (at your option) any later version. * 17 * (at your option) any later version. *
18 * * 18 * *
19 ***************************************************************************/ 19 ***************************************************************************/
20 20
21/* 21/*
22 Copyright (C) 1998, 1999 Jochen Wilhelmy 22 Copyright (C) 1998, 1999 Jochen Wilhelmy
23 digisnap@cs.tu-berlin.de 23 digisnap@cs.tu-berlin.de
24 24
25 This library is free software; you can redistribute it and/or 25 This library is free software; you can redistribute it and/or
26 modify it under the terms of the GNU Library General Public 26 modify it under the terms of the GNU Library General Public
27 License as published by the Free Software Foundation; either 27 License as published by the Free Software Foundation; either
28 version 2 of the License, or (at your option) any later version. 28 version 2 of the License, or (at your option) any later version.
29 29
30 This library is distributed in the hope that it will be useful, 30 This library is distributed in the hope that it will be useful,
31 but WITHOUT ANY WARRANTY; without even the implied warranty of 31 but WITHOUT ANY WARRANTY; without even the implied warranty of
32 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 32 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
33 Library General Public License for more details. 33 Library General Public License for more details.
34 34
35 You should have received a copy of the GNU Library General Public License 35 You should have received a copy of the GNU Library General Public License
36 along with this library; see the file COPYING.LIB. If not, write to 36 along with this library; see the file COPYING.LIB. If not, write to
37 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 37 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
38 Boston, MA 02111-1307, USA. 38 Boston, MA 02111-1307, USA.
39*/ 39*/
40 40
41#include "katedocument.h" 41#include "katedocument.h"
42 42
43 43
44#include <qfileinfo.h> 44#include <qfileinfo.h>
45#include <qdatetime.h> 45#include <qdatetime.h>
46 46
47#include <kmessagebox.h> 47#include <kmessagebox.h>
48#include <klocale.h>
49#include <qpe/config.h> 48#include <qpe/config.h>
50#include <qstring.h> 49#include <qstring.h>
51 50
52#include <sys/time.h> 51#include <sys/time.h>
53#include <unistd.h> 52#include <unistd.h>
54 53
55#include <stdio.h> 54#include <stdio.h>
56 55
57#include <qtimer.h> 56#include <qtimer.h>
58#include <qobject.h> 57#include <qobject.h>
59#include <qapplication.h> 58#include <qapplication.h>
60#include <qclipboard.h> 59#include <qclipboard.h>
61#include <qfont.h> 60#include <qfont.h>
62#include <qpainter.h> 61#include <qpainter.h>
63#include <qfile.h> 62#include <qfile.h>
64#include <qtextstream.h> 63#include <qtextstream.h>
65#include <qtextcodec.h> 64#include <qtextcodec.h>
66#include <kglobal.h> 65#include <kglobal.h>
67 66
68#include <klocale.h>
69//#include <kcharsets.h> 67//#include <kcharsets.h>
70#include <kdebug.h> 68#include <kdebug.h>
71//#include <kinstance.h> 69//#include <kinstance.h>
72 70
73#include <kglobalsettings.h> 71#include <kglobalsettings.h>
74//#include <kaction.h> 72//#include <kaction.h>
75//#include <kstdaction.h> 73//#include <kstdaction.h>
76 74
77#include "../view/kateview.h" 75#include "../view/kateview.h"
78#include "katebuffer.h" 76#include "katebuffer.h"
79#include "katetextline.h" 77#include "katetextline.h"
80 78
81#include "katecmd.h" 79#include "katecmd.h"
82 80
83KateAction::KateAction(Action a, PointStruc &cursor, int len, const QString &text) 81KateAction::KateAction(Action a, PointStruc &cursor, int len, const QString &text)
84 : action(a), cursor(cursor), len(len), text(text) { 82 : action(a), cursor(cursor), len(len), text(text) {
85} 83}
86 84
87KateActionGroup::KateActionGroup(PointStruc &aStart, int type) 85KateActionGroup::KateActionGroup(PointStruc &aStart, int type)
88 : start(aStart), action(0L), undoType(type) { 86 : start(aStart), action(0L), undoType(type) {
89} 87}
90 88
91KateActionGroup::~KateActionGroup() { 89KateActionGroup::~KateActionGroup() {
92 KateAction *current, *next; 90 KateAction *current, *next;
93 91
94 current = action; 92 current = action;
95 while (current) { 93 while (current) {
96 next = current->next; 94 next = current->next;
97 delete current; 95 delete current;
98 current = next; 96 current = next;
99 } 97 }
100} 98}
101 99
102void KateActionGroup::insertAction(KateAction *a) { 100void KateActionGroup::insertAction(KateAction *a) {
103 a->next = action; 101 a->next = action;
104 action = a; 102 action = a;
105} 103}
106 104
107const char * KateActionGroup::typeName(int type) 105const char * KateActionGroup::typeName(int type)
108{ 106{
109 // return a short text description of the given undo group type suitable for a menu 107 // return a short text description of the given undo group type suitable for a menu
110 // not the lack of i18n's, the caller is expected to handle translation 108 // not the lack of i18n's, the caller is expected to handle translation
111 switch (type) { 109 switch (type) {
112 case ugPaste : return "Paste Text"; 110 case ugPaste : return "Paste Text";
113 case ugDelBlock : return "Selection Overwrite"; 111 case ugDelBlock : return "Selection Overwrite";
114 case ugIndent : return "Indent"; 112 case ugIndent : return "Indent";
115 case ugUnindent : return "Unindent"; 113 case ugUnindent : return "Unindent";
116 case ugComment : return "Comment"; 114 case ugComment : return "Comment";
diff --git a/noncore/apps/tinykate/libkate/kateconfig.cpp b/noncore/apps/tinykate/libkate/kateconfig.cpp
index 06ac49f..96f91fb 100644
--- a/noncore/apps/tinykate/libkate/kateconfig.cpp
+++ b/noncore/apps/tinykate/libkate/kateconfig.cpp
@@ -1,71 +1,69 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include <qdir.h> 21#include <qdir.h>
22#include <qfile.h>
23#include <qfileinfo.h>
24#include <qmessagebox.h> 22#include <qmessagebox.h>
25#if QT_VERSION <= 230 && defined(QT_NO_CODECS) 23#if QT_VERSION <= 230 && defined(QT_NO_CODECS)
26#include <qtextcodec.h> 24#include <qtextcodec.h>
27#endif 25#endif
28#include <qtextstream.h> 26#include <qtextstream.h>
29 27
30#include <sys/stat.h> 28#include <sys/stat.h>
31#include <sys/types.h> 29#include <sys/types.h>
32#include <fcntl.h> 30#include <fcntl.h>
33#include <stdlib.h> 31#include <stdlib.h>
34#include <unistd.h> 32#include <unistd.h>
35 33
36#define QTOPIA_INTERNAL_LANGLIST 34#define QTOPIA_INTERNAL_LANGLIST
37#include "kateconfig.h" 35#include "kateconfig.h"
38#include <qpe/global.h> 36#include <qpe/global.h>
39 37
40 38
41/*! 39/*!
42 \internal 40 \internal
43*/ 41*/
44QString KateConfig::configFilename(const QString& name, Domain d) 42QString KateConfig::configFilename(const QString& name, Domain d)
45{ 43{
46 switch (d) { 44 switch (d) {
47 case File: 45 case File:
48 return name; 46 return name;
49 case User: { 47 case User: {
50 QDir dir = (QString(getenv("HOME")) + "/Settings"); 48 QDir dir = (QString(getenv("HOME")) + "/Settings");
51 if ( !dir.exists() ) 49 if ( !dir.exists() )
52 mkdir(dir.path().local8Bit(),0700); 50 mkdir(dir.path().local8Bit(),0700);
53 return dir.path() + "/" + name + ".conf"; 51 return dir.path() + "/" + name + ".conf";
54 } 52 }
55 } 53 }
56 return name; 54 return name;
57} 55}
58 56
59/*! 57/*!
60 \class KateConfig config.h 58 \class KateConfig config.h
61 \brief The KateConfig class provides for saving application cofniguration state. 59 \brief The KateConfig class provides for saving application cofniguration state.
62 60
63 You should keep a KateConfig in existence only while you do not want others 61 You should keep a KateConfig in existence only while you do not want others
64 to be able to change the state. There is no locking currently, but there 62 to be able to change the state. There is no locking currently, but there
65 may be in the future. 63 may be in the future.
66*/ 64*/
67 65
68/*! 66/*!
69 \enum KateConfig::KateConfigGroup 67 \enum KateConfig::KateConfigGroup
70 \internal 68 \internal
71*/ 69*/
diff --git a/noncore/apps/tinykate/libkate/view/kateview.cpp b/noncore/apps/tinykate/libkate/view/kateview.cpp
index 794fbdb..423634b 100644
--- a/noncore/apps/tinykate/libkate/view/kateview.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateview.cpp
@@ -1,132 +1,125 @@
1/*************************************************************************** 1/***************************************************************************
2 kateview.cpp - description 2 kateview.cpp - description
3 ------------------- 3 -------------------
4 begin : Mon Jan 15 2001 4 begin : Mon Jan 15 2001
5 copyright : (C) 2001 by Christoph "Crossfire" Cullmann 5 copyright : (C) 2001 by Christoph "Crossfire" Cullmann
6 (C) 2002 by Joseph Wenninger 6 (C) 2002 by Joseph Wenninger
7 email : crossfire@babylon2k.de 7 email : crossfire@babylon2k.de
8 jowenn@kde.org 8 jowenn@kde.org
9 ***************************************************************************/ 9 ***************************************************************************/
10 10
11/*************************************************************************** 11/***************************************************************************
12 * * 12 * *
13 * This program is free software; you can redistribute it and/or modify * 13 * This program is free software; you can redistribute it and/or modify *
14 * it under the terms of the GNU General Public License as published by * 14 * it under the terms of the GNU General Public License as published by *
15 * the Free Software Foundation; either version 2 of the License, or * 15 * the Free Software Foundation; either version 2 of the License, or *
16 * (at your option) any later version. * 16 * (at your option) any later version. *
17 * * 17 * *
18 ***************************************************************************/ 18 ***************************************************************************/
19 19
20/* 20/*
21 Copyright (C) 1998, 1999 Jochen Wilhelmy 21 Copyright (C) 1998, 1999 Jochen Wilhelmy
22 digisnap@cs.tu-berlin.de 22 digisnap@cs.tu-berlin.de
23 23
24 This library is free software; you can redistribute it and/or 24 This library is free software; you can redistribute it and/or
25 modify it under the terms of the GNU Library General Public 25 modify it under the terms of the GNU Library General Public
26 License as published by the Free Software Foundation; either 26 License as published by the Free Software Foundation; either
27 version 2 of the License, or (at your option) any later version. 27 version 2 of the License, or (at your option) any later version.
28 28
29 This library is distributed in the hope that it will be useful, 29 This library is distributed in the hope that it will be useful,
30 but WITHOUT ANY WARRANTY; without even the implied warranty of 30 but WITHOUT ANY WARRANTY; without even the implied warranty of
31 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 31 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
32 Library General Public License for more details. 32 Library General Public License for more details.
33 33
34 You should have received a copy of the GNU Library General Public License 34 You should have received a copy of the GNU Library General Public License
35 along with this library; see the file COPYING.LIB. If not, write to 35 along with this library; see the file COPYING.LIB. If not, write to
36 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 36 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
37 Boston, MA 02111-1307, USA. 37 Boston, MA 02111-1307, USA.
38*/ 38*/
39 39
40 40
41 41
42#include "kateview.h" 42#include "kateview.h"
43 43
44#include "../document/katedocument.h" 44#include "../document/katedocument.h"
45#include "../document/katecmd.h" 45#include "../document/katecmd.h"
46#include "../document/katehighlight.h" 46#include "../document/katehighlight.h"
47#include "kateviewdialog.h"
48#include "../document/katedialogs.h" 47#include "../document/katedialogs.h"
48#include "kateviewdialog.h"
49#include <kateconfig.h> 49#include <kateconfig.h>
50 50
51#include <qfocusdata.h>
52#include <kdebug.h>
53#include <kapplication.h> 51#include <kapplication.h>
54#include <qscrollbar.h> 52#include <qscrollbar.h>
55#include <qiodevice.h>
56#include <qpopupmenu.h> 53#include <qpopupmenu.h>
57#include <kpopupmenu.h> 54#include <kpopupmenu.h>
58#include <qkeycode.h> 55#include <qkeycode.h>
59#include <qintdict.h> 56#include <qintdict.h>
60#include <qfont.h> 57#include <qfont.h>
61#include <qpainter.h> 58#include <qpainter.h>
62#include <qpixmap.h> 59#include <qpixmap.h>
63#include <qfileinfo.h> 60#include <qfileinfo.h>
64#include <qfile.h> 61#include <qfile.h>
65#include <qevent.h> 62#include <qevent.h>
66#include <qdir.h> 63#include <qdir.h>
67#include <qvbox.h> 64#include <qvbox.h>
68#include <qprintdialog.h> 65#include <qprintdialog.h>
69#include <qpaintdevicemetrics.h> 66#include <qpaintdevicemetrics.h>
70#include <qiodevice.h>
71#include <qbuffer.h> 67#include <qbuffer.h>
72#include <qfocusdata.h>
73#include <klocale.h> 68#include <klocale.h>
74#include <kglobal.h> 69#include <kglobal.h>
75#include <kdebug.h>
76#include <kmessagebox.h> 70#include <kmessagebox.h>
77#include <qregexp.h> 71#include <qregexp.h>
78#include <kdialogbase.h> 72#include <kdialogbase.h>
79#include <klineeditdlg.h> 73#include <klineeditdlg.h>
80#include <qapplication.h> 74#include <qapplication.h>
81#include <kfiledialog.h> 75#include <kfiledialog.h>
82#include <kiconloader.h> 76#include <kiconloader.h>
83#include "../document/katetextline.h" 77#include "../document/katetextline.h"
84#include "kateviewdialog.h"
85#include "kateundohistory.h" 78#include "kateundohistory.h"
86#include <qlayout.h> 79#include <qlayout.h>
87#include <qpe/qpeapplication.h> 80#include <qpe/qpeapplication.h>
88 81
89KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) : QWidget(view) 82KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) : QWidget(view)
90{ 83{
91 waitForPreHighlight=-1; 84 waitForPreHighlight=-1;
92 myView = view; 85 myView = view;
93 myDoc = doc; 86 myDoc = doc;
94 87
95 iconBorderWidth = 16; 88 iconBorderWidth = 16;
96 iconBorderHeight = 800; 89 iconBorderHeight = 800;
97 90
98 QWidget::setCursor(ibeamCursor); 91 QWidget::setCursor(ibeamCursor);
99 setBackgroundMode(NoBackground); 92 setBackgroundMode(NoBackground);
100 93
101 setFocusPolicy(StrongFocus); 94 setFocusPolicy(StrongFocus);
102 95
103 xScroll = new QScrollBar(QScrollBar::Horizontal,myView); 96 xScroll = new QScrollBar(QScrollBar::Horizontal,myView);
104 yScroll = new QScrollBar(QScrollBar::Vertical,myView); 97 yScroll = new QScrollBar(QScrollBar::Vertical,myView);
105 connect(xScroll,SIGNAL(valueChanged(int)),SLOT(changeXPos(int))); 98 connect(xScroll,SIGNAL(valueChanged(int)),SLOT(changeXPos(int)));
106 connect(yScroll,SIGNAL(valueChanged(int)),SLOT(changeYPos(int))); 99 connect(yScroll,SIGNAL(valueChanged(int)),SLOT(changeYPos(int)));
107 connect(yScroll,SIGNAL(valueChanged(int)),myView,SIGNAL(scrollValueChanged(int))); 100 connect(yScroll,SIGNAL(valueChanged(int)),myView,SIGNAL(scrollValueChanged(int)));
108 connect( doc, SIGNAL (preHighlightChanged(long)),this,SLOT(slotPreHighlightUpdate(long))); 101 connect( doc, SIGNAL (preHighlightChanged(long)),this,SLOT(slotPreHighlightUpdate(long)));
109 102
110 xPos = 0; 103 xPos = 0;
111 yPos = 0; 104 yPos = 0;
112 105
113 scrollTimer = 0; 106 scrollTimer = 0;
114 107
115 cursor.x = 0; 108 cursor.x = 0;
116 cursor.y = 0; 109 cursor.y = 0;
117 cursorOn = false; 110 cursorOn = false;
118 cursorTimer = 0; 111 cursorTimer = 0;
119 cXPos = 0; 112 cXPos = 0;
120 cOldXPos = 0; 113 cOldXPos = 0;
121 114
122 startLine = 0; 115 startLine = 0;
123 endLine = -1; 116 endLine = -1;
124 117
125 exposeCursor = false; 118 exposeCursor = false;
126 updateState = 0; 119 updateState = 0;
127 numLines = 0; 120 numLines = 0;
128 lineRanges = 0L; 121 lineRanges = 0L;
129 newXPos = -1; 122 newXPos = -1;
130 newYPos = -1; 123 newYPos = -1;
131 124
132 drawBuffer = new QPixmap (); 125 drawBuffer = new QPixmap ();
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
index bd5b74f..a85fb87 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
@@ -1,92 +1,90 @@
1/*************************************************************************** 1/***************************************************************************
2 kateviewdialog.cpp - description 2 kateviewdialog.cpp - description
3 ------------------- 3 -------------------
4 copyright : (C) 2001 by The Kate Team 4 copyright : (C) 2001 by The Kate Team
5 (C) 2002 by Joseph Wenninger 5 (C) 2002 by Joseph Wenninger
6 email : kwrite-devel@kde.org 6 email : kwrite-devel@kde.org
7 jowenn@kde.org 7 jowenn@kde.org
8 8
9 ***************************************************************************/ 9 ***************************************************************************/
10 10
11/*************************************************************************** 11/***************************************************************************
12 * * 12 * *
13 * This program is free software; you can redistribute it and/or modify * 13 * This program is free software; you can redistribute it and/or modify *
14 * it under the terms of the GNU General Public License as published by * 14 * it under the terms of the GNU General Public License as published by *
15 * the Free Software Foundation; either version 2 of the License, or * 15 * the Free Software Foundation; either version 2 of the License, or *
16 * (at your option) any later version. * 16 * (at your option) any later version. *
17 * * 17 * *
18 ***************************************************************************/ 18 ***************************************************************************/
19// Dialogs 19// Dialogs
20 20
21#include <stdio.h> 21#include <stdio.h>
22#include <stdlib.h> 22#include <stdlib.h>
23 23
24#include <qgrid.h> 24#include <qgrid.h>
25#include <qlabel.h> 25#include <qlabel.h>
26#include <qlayout.h> 26#include <qlayout.h>
27#include <qlistbox.h> 27#include <qlistbox.h>
28#include <qspinbox.h>
29#include <qcombobox.h>
30#include <qgroupbox.h> 28#include <qgroupbox.h>
31#include <qlineedit.h> 29#include <qlineedit.h>
32#include <qcheckbox.h> 30#include <qcheckbox.h>
33#include <qcollection.h> 31#include <qcollection.h>
34#include <qpushbutton.h> 32#include <qpushbutton.h>
35#include <qobjectlist.h> 33#include <qobjectlist.h>
36#include <qradiobutton.h> 34#include <qradiobutton.h>
37#include <qwhatsthis.h> 35#include <qwhatsthis.h>
38#include <qstringlist.h> 36#include <qstringlist.h>
39#include <klocale.h> 37#include <klocale.h>
40#include <kcolorbtn.h> 38#include <kcolorbtn.h>
41#include <qcombobox.h>
42#include <kglobal.h> 39#include <kglobal.h>
43#include <qvbox.h> 40#include <qvbox.h>
44#include <qspinbox.h> 41#include <qspinbox.h>
42#include <qcombobox.h>
45#include <kfontdialog.h> 43#include <kfontdialog.h>
46 44
47#include "../document/katedocument.h" 45#include "../document/katedocument.h"
48#include "kateviewdialog.h" 46#include "kateviewdialog.h"
49#include <opie2/ofontselector.h> 47#include <opie2/ofontselector.h>
50 48
51 49
52SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags ) 50SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags )
53 : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok ) 51 : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok )
54 , m_replace( 0L ) 52 , m_replace( 0L )
55{ 53{
56 QWidget *page = new QWidget( this ); 54 QWidget *page = new QWidget( this );
57 setMainWidget( page ); 55 setMainWidget( page );
58 56
59 QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); 57 QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() );
60 58
61 m_search = new QComboBox( true, page ); 59 m_search = new QComboBox( true, page );
62 m_search->insertStringList( searchFor ); 60 m_search->insertStringList( searchFor );
63 m_search->setMinimumWidth( m_search->sizeHint().width() ); 61 m_search->setMinimumWidth( m_search->sizeHint().width() );
64 m_search->lineEdit()->selectAll(); 62 m_search->lineEdit()->selectAll();
65 QLabel *label = new QLabel( m_search, i18n( "&Text To Find:" ), page ); 63 QLabel *label = new QLabel( m_search, i18n( "&Text To Find:" ), page );
66 m_optRegExp = new QCheckBox( i18n( "Regular Expression" ), page ); 64 m_optRegExp = new QCheckBox( i18n( "Regular Expression" ), page );
67 topLayout->addWidget( label ); 65 topLayout->addWidget( label );
68 topLayout->addWidget( m_search ); 66 topLayout->addWidget( m_search );
69 topLayout->addWidget( m_optRegExp ); 67 topLayout->addWidget( m_optRegExp );
70 68
71 if( flags & KateView::sfReplace ) 69 if( flags & KateView::sfReplace )
72 { 70 {
73 // make it a replace dialog 71 // make it a replace dialog
74 setCaption( i18n( "Replace Text" ) ); 72 setCaption( i18n( "Replace Text" ) );
75 m_replace = new QComboBox( true, page ); 73 m_replace = new QComboBox( true, page );
76 m_replace->insertStringList( replaceWith ); 74 m_replace->insertStringList( replaceWith );
77 m_replace->setMinimumWidth( m_search->sizeHint().width() ); 75 m_replace->setMinimumWidth( m_search->sizeHint().width() );
78 label = new QLabel( m_replace, i18n( "&Replace With:" ), page ); 76 label = new QLabel( m_replace, i18n( "&Replace With:" ), page );
79 //m_optPlaceholders = new QCheckBox( i18n( "&Use Placeholders" ), page ); 77 //m_optPlaceholders = new QCheckBox( i18n( "&Use Placeholders" ), page );
80 topLayout->addWidget( label ); 78 topLayout->addWidget( label );
81 topLayout->addWidget( m_replace ); 79 topLayout->addWidget( m_replace );
82 //topLayout->addWidget( m_optPlaceholders ); 80 //topLayout->addWidget( m_optPlaceholders );
83 } 81 }
84 82
85 QGroupBox *group = new QGroupBox( i18n( "Options" ), page ); 83 QGroupBox *group = new QGroupBox( i18n( "Options" ), page );
86 topLayout->addWidget( group, 10 ); 84 topLayout->addWidget( group, 10 );
87 85
88 QGridLayout *gbox = new QGridLayout( group, 5, 2, spacingHint() ); 86 QGridLayout *gbox = new QGridLayout( group, 5, 2, spacingHint() );
89 gbox->addRowSpacing( 0, fontMetrics().lineSpacing() ); 87 gbox->addRowSpacing( 0, fontMetrics().lineSpacing() );
90 gbox->setRowStretch( 4, 10 ); 88 gbox->setRowStretch( 4, 10 );
91 89
92 m_opt1 = new QCheckBox( i18n( "C&ase Sensitive" ), group ); 90 m_opt1 = new QCheckBox( i18n( "C&ase Sensitive" ), group );
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index bbf80ce..19a0127 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -1,80 +1,75 @@
1/*************************************************************************** 1/***************************************************************************
2 tinykate.cpp 2 tinykate.cpp
3 Tiny KATE mainwindow 3 Tiny KATE mainwindow
4 ------------------- 4 -------------------
5 begin : November 2002 5 begin : November 2002
6 copyright : (C) 2002 by Joseph Wenninger <jowenn@kde.org> 6 copyright : (C) 2002 by Joseph Wenninger <jowenn@kde.org>
7 ***************************************************************************/ 7 ***************************************************************************/
8 8
9/*************************************************************************** 9/***************************************************************************
10 * * 10 * *
11 * This program is free softwaSre; you can redistribute it and/or modify * 11 * This program is free softwaSre; you can redistribute it and/or modify *
12 * it under the terms of the GNU General Public License as published by * 12 * it under the terms of the GNU General Public License as published by *
13 * the Free Software Foundation. * 13 * the Free Software Foundation. *
14 * ONLY VERSION 2 OF THE LICENSE IS APPLICABLE * 14 * ONLY VERSION 2 OF THE LICENSE IS APPLICABLE *
15 * * 15 * *
16 ***************************************************************************/ 16 ***************************************************************************/
17#include <qwidget.h>
18#include <qaction.h> 17#include <qaction.h>
19#include <qlayout.h>
20#include <qtoolbutton.h> 18#include <qtoolbutton.h>
21#include <qmenubar.h> 19#include <qmenubar.h>
22#include <qpe/resource.h> 20#include <qpe/resource.h>
23#include <qpe/global.h>
24#include <qpe/qpeapplication.h> 21#include <qpe/qpeapplication.h>
25 22
26#include <opie2/ofiledialog.h> 23#include <opie2/ofiledialog.h>
27 24
28#include "tinykate.h" 25#include "tinykate.h"
29 26
30#include <katedocument.h> 27#include <katedocument.h>
31#include <katehighlight.h>
32#include <kateview.h>
33#include <kglobal.h> 28#include <kglobal.h>
34 29
35TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : 30TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
36 QMainWindow( parent, name, f ) 31 QMainWindow( parent, name, f )
37{ 32{
38 shutDown=false; 33 shutDown=false;
39 nextUnnamed=0; 34 nextUnnamed=0;
40 currentView=0; 35 currentView=0;
41 viewCount=0; 36 viewCount=0;
42 setCaption(tr("TinyKATE")); 37 setCaption(tr("TinyKATE"));
43 KGlobal::setAppName("TinyKATE"); 38 KGlobal::setAppName("TinyKATE");
44 39
45 QMenuBar *mb = new QMenuBar( this ); 40 QMenuBar *mb = new QMenuBar( this );
46 mb->setMargin( 0 ); 41 mb->setMargin( 0 );
47 42
48 tabwidget=new OTabWidget(this); 43 tabwidget=new OTabWidget(this);
49 setCentralWidget(tabwidget); 44 setCentralWidget(tabwidget);
50 connect(tabwidget,SIGNAL(currentChanged( QWidget *)),this,SLOT(slotCurrentChanged(QWidget *))); 45 connect(tabwidget,SIGNAL(currentChanged( QWidget *)),this,SLOT(slotCurrentChanged(QWidget *)));
51 46
52//FILE ACTIONS 47//FILE ACTIONS
53 QPopupMenu *popup = new QPopupMenu( this ); 48 QPopupMenu *popup = new QPopupMenu( this );
54 49
55 // Action for creating a new document 50 // Action for creating a new document
56 QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); 51 QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
57 a->addTo( popup ); 52 a->addTo( popup );
58 connect(a, SIGNAL(activated()), this, SLOT(slotNew())); 53 connect(a, SIGNAL(activated()), this, SLOT(slotNew()));
59 54
60 // Action for opening an exisiting document 55 // Action for opening an exisiting document
61 a = new QAction( tr( "Open" ),Resource::loadPixmap( "fileopen" ) , QString::null, 0, this, 0 ); 56 a = new QAction( tr( "Open" ),Resource::loadPixmap( "fileopen" ) , QString::null, 0, this, 0 );
62 a->addTo(popup); 57 a->addTo(popup);
63 connect(a, SIGNAL(activated()), this, SLOT(slotOpen())); 58 connect(a, SIGNAL(activated()), this, SLOT(slotOpen()));
64 59
65 60
66 // Action for saving document 61 // Action for saving document
67 a = new QAction( tr( "Save" ), Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 ); 62 a = new QAction( tr( "Save" ), Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
68 a->addTo(popup); 63 a->addTo(popup);
69 connect(a, SIGNAL(activated()), this, SLOT(slotSave())); 64 connect(a, SIGNAL(activated()), this, SLOT(slotSave()));
70 65
71 // Action for saving document to a new name 66 // Action for saving document to a new name
72 a = new QAction( tr( "Save As" ),Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 ); 67 a = new QAction( tr( "Save As" ),Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
73 a->addTo(popup); 68 a->addTo(popup);
74 connect(a, SIGNAL(activated()), this, SLOT(slotSaveAs())); 69 connect(a, SIGNAL(activated()), this, SLOT(slotSaveAs()));
75 70
76 // Action for closing the currently active document 71 // Action for closing the currently active document
77 a = new QAction( tr( "Close" ), Resource::loadPixmap( "quit_icon" ) , QString::null, 0, this, 0 ); 72 a = new QAction( tr( "Close" ), Resource::loadPixmap( "quit_icon" ) , QString::null, 0, this, 0 );
78 a->addTo(popup); 73 a->addTo(popup);
79 connect(a, SIGNAL(activated()), this, SLOT(slotClose())); 74 connect(a, SIGNAL(activated()), this, SLOT(slotClose()));
80 75
diff --git a/noncore/apps/zsafe/category.cpp b/noncore/apps/zsafe/category.cpp
index ce1d614..15448f0 100644
--- a/noncore/apps/zsafe/category.cpp
+++ b/noncore/apps/zsafe/category.cpp
@@ -1,54 +1,53 @@
1/* C implementation of RC2 encryption algorithm, as described in RFC2268 */ 1/* C implementation of RC2 encryption algorithm, as described in RFC2268 */
2/* By Matthew Palmer <mjp16@uow.edu.au> */ 2/* By Matthew Palmer <mjp16@uow.edu.au> */
3/* $Id$ */ 3/* $Id$ */
4 4
5#include "category.h" 5#include "category.h"
6#include <qlistview.h>
7 6
8Category::Category() 7Category::Category()
9{ 8{
10} 9}
11 10
12Category::~Category() 11Category::~Category()
13{ 12{
14} 13}
15 14
16QString Category::getIconName() 15QString Category::getIconName()
17{ 16{
18 return iconName; 17 return iconName;
19} 18}
20 19
21QString Category::getCategoryName() 20QString Category::getCategoryName()
22{ 21{
23 return categoryName; 22 return categoryName;
24} 23}
25 24
26QListViewItem * Category::getListItem() 25QListViewItem * Category::getListItem()
27{ 26{
28 return listItem; 27 return listItem;
29} 28}
30 29
31QPixmap Category::getIcon() 30QPixmap Category::getIcon()
32{ 31{
33 return icon; 32 return icon;
34} 33}
35 34
36void Category::setIconName(QString name) 35void Category::setIconName(QString name)
37{ 36{
38 iconName = name; 37 iconName = name;
39} 38}
40 39
41void Category::setCategoryName(QString name) 40void Category::setCategoryName(QString name)
42{ 41{
43 categoryName = name; 42 categoryName = name;
44} 43}
45 44
46void Category::setListItem(QListViewItem *item) 45void Category::setListItem(QListViewItem *item)
47{ 46{
48 listItem = item; 47 listItem = item;
49} 48}
50 49
51void Category::setIcon(QPixmap item) 50void Category::setIcon(QPixmap item)
52{ 51{
53 icon = item; 52 icon = item;
54} 53}
diff --git a/noncore/apps/zsafe/main.cpp b/noncore/apps/zsafe/main.cpp
index 7ff549b..4fe319b 100644
--- a/noncore/apps/zsafe/main.cpp
+++ b/noncore/apps/zsafe/main.cpp
@@ -1,66 +1,65 @@
1/* 1/*
2** Author: Carsten Schneider <CarstenSchneider@t-online.de> 2** Author: Carsten Schneider <CarstenSchneider@t-online.de>
3** 3**
4** $Id$ 4** $Id$
5** 5**
6** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html 6** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html
7*/ 7*/
8 8
9 9
10#include "zsafe.h" 10#include "zsafe.h"
11#ifdef DESKTOP 11#ifdef DESKTOP
12#include <qapplication.h> 12#include <qapplication.h>
13#else 13#else
14#include <qpe/qpeapplication.h> 14#include <qpe/qpeapplication.h>
15#endif 15#endif
16#include <stdio.h> 16#include <stdio.h>
17#include <signal.h> 17#include <signal.h>
18#include "qsettings.h"
19 18
20ZSafe *zs; 19ZSafe *zs;
21#ifdef DESKTOP 20#ifdef DESKTOP
22QApplication *appl; 21QApplication *appl;
23#else 22#else
24QPEApplication *appl; 23QPEApplication *appl;
25#endif 24#endif
26 25
27int DeskW; 26int DeskW;
28int DeskH; 27int DeskH;
29 28
30void suspend (int signum) 29void suspend (int signum)
31{ 30{
32 printf ("Suspend signal %d received\n", signum); 31 printf ("Suspend signal %d received\n", signum);
33} 32}
34 33
35void resume (int signum) 34void resume (int signum)
36{ 35{
37 printf ("Resume signal %d received\n", signum); 36 printf ("Resume signal %d received\n", signum);
38 zs->resume(signum); 37 zs->resume(signum);
39} 38}
40 39
41int main( int argc, char ** argv ) 40int main( int argc, char ** argv )
42{ 41{
43#ifndef WIN32 42#ifndef WIN32
44 // install signal handler 43 // install signal handler
45 signal (SIGSTOP, suspend); 44 signal (SIGSTOP, suspend);
46#endif 45#endif
47 46
48#ifdef DESKTOP 47#ifdef DESKTOP
49 QApplication a( argc, argv ); 48 QApplication a( argc, argv );
50#else 49#else
51 QPEApplication a( argc, argv ); 50 QPEApplication a( argc, argv );
52#endif 51#endif
53 appl = &a; 52 appl = &a;
54 53
55#ifdef DESKTOP 54#ifdef DESKTOP
56 if (argc >= 3) 55 if (argc >= 3)
57 { 56 {
58#ifndef WIN32 57#ifndef WIN32
59 DeskW = atoi(argv[1]); 58 DeskW = atoi(argv[1]);
60 DeskH = atoi(argv[2]); 59 DeskH = atoi(argv[2]);
61#else 60#else
62 int w, h; 61 int w, h;
63 sscanf (argv[1], "%d", &w); 62 sscanf (argv[1], "%d", &w);
64 sscanf (argv[2], "%d", &h); 63 sscanf (argv[2], "%d", &h);
65 DeskW = w; 64 DeskW = w;
66 DeskH = h; 65 DeskH = h;
diff --git a/noncore/apps/zsafe/qsettings.cpp b/noncore/apps/zsafe/qsettings.cpp
index 62a9947..ee55339 100755
--- a/noncore/apps/zsafe/qsettings.cpp
+++ b/noncore/apps/zsafe/qsettings.cpp
@@ -1,54 +1,53 @@
1/* 1/*
2** $Id$ 2** $Id$
3*/ 3*/
4 4
5#include "qsettings.h" 5#include "qsettings.h"
6#include <qstringlist.h>
7#include <stdio.h> 6#include <stdio.h>
8#include <qfile.h> 7#include <qfile.h>
9#include <qtextstream.h> 8#include <qtextstream.h>
10 9
11 10
12QSettings::QSettings(const QString &_fn) 11QSettings::QSettings(const QString &_fn)
13{ 12{
14 // read the prefs from the file 13 // read the prefs from the file
15 fn = _fn; 14 fn = _fn;
16 15
17 QFile f(_fn); 16 QFile f(_fn);
18 if ( f.open(IO_ReadOnly) ) { // file opened successfully 17 if ( f.open(IO_ReadOnly) ) { // file opened successfully
19 QTextStream t( &f ); // use a text stream 18 QTextStream t( &f ); // use a text stream
20 QString s; 19 QString s;
21 while ( !t.eof() ) { // until end of file... 20 while ( !t.eof() ) { // until end of file...
22 s = t.readLine(); // line of text excluding '\n' 21 s = t.readLine(); // line of text excluding '\n'
23 char buf[256]; 22 char buf[256];
24 sprintf (buf, "%s", (const char *) s); 23 sprintf (buf, "%s", (const char *) s);
25 int pos = s.find (" = "); 24 int pos = s.find (" = ");
26 QString key = s.left (pos); 25 QString key = s.left (pos);
27 QString val = s.right (s.length() - pos - 3); 26 QString val = s.right (s.length() - pos - 3);
28 writeEntry (key, val); 27 writeEntry (key, val);
29 28
30 sprintf (buf, "%s|%s", (const char *)key, (const char *)val); 29 sprintf (buf, "%s|%s", (const char *)key, (const char *)val);
31 } 30 }
32 f.close(); 31 f.close();
33 } 32 }
34 33
35 34
36} 35}
37 36
38QSettings::~QSettings() 37QSettings::~QSettings()
39{ 38{
40 // write out the prefs to the file 39 // write out the prefs to the file
41 QAsciiDictIterator <QString> it( prefs ); // iterator for dict 40 QAsciiDictIterator <QString> it( prefs ); // iterator for dict
42 QFile f(fn); 41 QFile f(fn);
43 f.open(IO_WriteOnly); 42 f.open(IO_WriteOnly);
44 QTextStream ts( &f ); 43 QTextStream ts( &f );
45 44
46 while ( it.current() ) 45 while ( it.current() )
47 { 46 {
48 QString *key = new QString(it.currentKey()); 47 QString *key = new QString(it.currentKey());
49 char buf[256]; 48 char buf[256];
50 sprintf (buf, "%s", (const char *) *( it.current())); 49 sprintf (buf, "%s", (const char *) *( it.current()));
51 QString *val = new QString(buf); 50 QString *val = new QString(buf);
52 sprintf (buf, "%s %s", (const char *)*key, (const char *)*val); 51 sprintf (buf, "%s %s", (const char *)*key, (const char *)*val);
53 ts << *key << " = " << *val << endl; 52 ts << *key << " = " << *val << endl;
54 ++it; 53 ++it;
diff --git a/noncore/apps/zsafe/scqtfiledlg.cpp b/noncore/apps/zsafe/scqtfiledlg.cpp
index d6cea64..dd72fdf 100644
--- a/noncore/apps/zsafe/scqtfiledlg.cpp
+++ b/noncore/apps/zsafe/scqtfiledlg.cpp
@@ -1,70 +1,65 @@
1/**************************************************************************** 1/****************************************************************************
2** Form implementation generated from reading ui file 'scqtfiledlg.ui' 2** Form implementation generated from reading ui file 'scqtfiledlg.ui'
3** 3**
4** Created: Sun Jun 8 15:51:12 2003 4** Created: Sun Jun 8 15:51:12 2003
5** by: The User Interface Compiler (uic) 5** by: The User Interface Compiler (uic)
6** 6**
7** WARNING! All changes made in this file will be lost! 7** WARNING! All changes made in this file will be lost!
8****************************************************************************/ 8****************************************************************************/
9#include "scqtfiledlg.h" 9#include "scqtfiledlg.h"
10 10
11#include <qcombobox.h> 11#include <qcombobox.h>
12#include <qheader.h>
13#include <qlineedit.h> 12#include <qlineedit.h>
14#include <qlistview.h> 13#include <qlistview.h>
15#include <qpushbutton.h>
16#include <qtoolbutton.h> 14#include <qtoolbutton.h>
17#include <qlayout.h> 15#include <qlayout.h>
18#include <qvariant.h>
19#include <qtooltip.h> 16#include <qtooltip.h>
20#include <qwhatsthis.h> 17#include <qwhatsthis.h>
21#include <qimage.h>
22#include <qpixmap.h>
23 18
24static const char* const image0_data[] = { 19static const char* const image0_data[] = {
25"24 16 3 1", 20"24 16 3 1",
26". c None", 21". c None",
27"# c #000040", 22"# c #000040",
28"a c #808080", 23"a c #808080",
29"........................", 24"........................",
30"........................", 25"........................",
31".................####...", 26".................####...",
32".................####...", 27".................####...",
33".......##........#aa#...", 28".......##........#aa#...",
34"......###........#aa#...", 29"......###........#aa#...",
35".....####........#aa#...", 30".....####........#aa#...",
36"....##############aa#...", 31"....##############aa#...",
37"...###aaaaaaaaaaaaaa#...", 32"...###aaaaaaaaaaaaaa#...",
38"..####aaaaaaaaaaaaaa#...", 33"..####aaaaaaaaaaaaaa#...",
39"...###aaaaaaaaaaaaaa#...", 34"...###aaaaaaaaaaaaaa#...",
40"....#################...", 35"....#################...",
41".....####...............", 36".....####...............",
42"......###...............", 37"......###...............",
43".......##...............", 38".......##...............",
44"........................"}; 39"........................"};
45 40
46static const char* const image1_data[] = { 41static const char* const image1_data[] = {
47"24 16 4 1", 42"24 16 4 1",
48". c None", 43". c None",
49"a c #008080", 44"a c #008080",
50"b c #808080", 45"b c #808080",
51"# c #ff0000", 46"# c #ff0000",
52"........................", 47"........................",
53"........................", 48"........................",
54"...####..........####...", 49"...####..........####...",
55"...#####........#####...", 50"...#####........#####...",
56"....######.....#####a...", 51"....######.....#####a...",
57".....######...#####ba...", 52".....######...#####ba...",
58".....aa###########bba...", 53".....aa###########bba...",
59"....aaaaa#######aabba...", 54"....aaaaa#######aabba...",
60"...aaabbb######bbbbba...", 55"...aaabbb######bbbbba...",
61"..aaaabb########bbbba...", 56"..aaaabb########bbbba...",
62"...aaa############bba...", 57"...aaa############bba...",
63"....a######aaa#####aa...", 58"....a######aaa#####aa...",
64"....######.....######...", 59"....######.....######...",
65"...#####a........####...", 60"...#####a........####...",
66"...####aa.........###...", 61"...####aa.........###...",
67"........................"}; 62"........................"};
68 63
69static const char* const image2_data[] = { 64static const char* const image2_data[] = {
70"17 15 4 1", 65"17 15 4 1",
diff --git a/noncore/apps/zsafe/scqtfileedit.cpp b/noncore/apps/zsafe/scqtfileedit.cpp
index 7a3d906..08fc2b5 100644
--- a/noncore/apps/zsafe/scqtfileedit.cpp
+++ b/noncore/apps/zsafe/scqtfileedit.cpp
@@ -1,73 +1,69 @@
1/*************************************************************************** 1/***************************************************************************
2 scqtfileedit.cpp - description 2 scqtfileedit.cpp - description
3 ------------------- 3 -------------------
4 begin : Mon Sep 3 2001 4 begin : Mon Sep 3 2001
5 copyright : (C) 2001 by Werner Schulte 5 copyright : (C) 2001 by Werner Schulte
6 email : sc@schulte-ac.de 6 email : sc@schulte-ac.de
7 ***************************************************************************/ 7 ***************************************************************************/
8 8
9/* $Id$ */ 9/* $Id$ */
10 10
11/*************************************************************************** 11/***************************************************************************
12 * * 12 * *
13 * This program is free software; you can redistribute it and/or modify * 13 * This program is free software; you can redistribute it and/or modify *
14 * it under the terms of the GNU General Public License as published by * 14 * it under the terms of the GNU General Public License as published by *
15 * the Free Software Foundation; either version 2 of the License, or * 15 * the Free Software Foundation; either version 2 of the License, or *
16 * (at your option) any later version. * 16 * (at your option) any later version. *
17 * * 17 * *
18 ***************************************************************************/ 18 ***************************************************************************/
19#include <stdio.h> 19#include <stdio.h>
20#include <stdlib.h> 20#include <stdlib.h>
21 21
22#include "qdir.h"
23#include "qdialog.h"
24#include "qpixmap.h"
25#include "qlistview.h"
26#include "qlineedit.h" 22#include "qlineedit.h"
27#include "qtoolbutton.h" 23#include "qtoolbutton.h"
28 24
29#include "scqtfileedit.h" 25#include "scqtfileedit.h"
30 26
31#include <qpe/qpeapplication.h> 27#include <qpe/qpeapplication.h>
32 28
33// #define DEBUGFILEEDIT 29// #define DEBUGFILEEDIT
34 30
35/* XPM */ 31/* XPM */
36static const char* const file_xpm[]={ 32static const char* const file_xpm[]={
37 "16 16 5 1", 33 "16 16 5 1",
38 ". c #7f7f7f", 34 ". c #7f7f7f",
39 "# c None", 35 "# c None",
40 "c c #000000", 36 "c c #000000",
41 "b c #bfbfbf", 37 "b c #bfbfbf",
42 "a c #ffffff", 38 "a c #ffffff",
43 "################", 39 "################",
44 "..........######", 40 "..........######",
45 ".aaaaaaaab.#####", 41 ".aaaaaaaab.#####",
46 ".aaaaaaaaba.####", 42 ".aaaaaaaaba.####",
47 ".aaaaaaaacccc###", 43 ".aaaaaaaacccc###",
48 ".aaaaaaaaaabc###", 44 ".aaaaaaaaaabc###",
49 ".aaaaaaaaaabc###", 45 ".aaaaaaaaaabc###",
50 ".aaaaaaaaaabc###", 46 ".aaaaaaaaaabc###",
51 ".aaaaaaaaaabc###", 47 ".aaaaaaaaaabc###",
52 ".aaaaaaaaaabc###", 48 ".aaaaaaaaaabc###",
53 ".aaaaaaaaaabc###", 49 ".aaaaaaaaaabc###",
54 ".aaaaaaaaaabc###", 50 ".aaaaaaaaaabc###",
55 ".aaaaaaaaaabc###", 51 ".aaaaaaaaaabc###",
56 ".aaaaaaaaaabc###", 52 ".aaaaaaaaaabc###",
57 ".bbbbbbbbbbbc###", 53 ".bbbbbbbbbbbc###",
58 "ccccccccccccc###"}; 54 "ccccccccccccc###"};
59 55
60/* XPM */ 56/* XPM */
61static const char * const link_file_xpm[]={ 57static const char * const link_file_xpm[]={
62 "16 16 10 1", 58 "16 16 10 1",
63 "h c #808080", 59 "h c #808080",
64 "g c #a0a0a0", 60 "g c #a0a0a0",
65 "d c #c3c3c3", 61 "d c #c3c3c3",
66 ". c #7f7f7f", 62 ". c #7f7f7f",
67 "c c #000000", 63 "c c #000000",
68 "b c #bfbfbf", 64 "b c #bfbfbf",
69 "f c #303030", 65 "f c #303030",
70 "e c #585858", 66 "e c #585858",
71 "a c #ffffff", 67 "a c #ffffff",
72 "# c None", 68 "# c None",
73 "################", 69 "################",
diff --git a/noncore/apps/zsafe/zlistview.cpp b/noncore/apps/zsafe/zlistview.cpp
index 23bbc4e..ba02a15 100644
--- a/noncore/apps/zsafe/zlistview.cpp
+++ b/noncore/apps/zsafe/zlistview.cpp
@@ -1,38 +1,36 @@
1/* 1/*
2** $Id$ 2** $Id$
3*/ 3*/
4 4
5#include "zlistview.h" 5#include "zlistview.h"
6#include <qlistview.h>
7#include <qevent.h>
8#include <stdio.h> 6#include <stdio.h>
9#include "zsafe.h" 7#include "zsafe.h"
10 8
11ZListView::ZListView (ZSafe *zsafe, const char *id) : QListView(zsafe, id) 9ZListView::ZListView (ZSafe *zsafe, const char *id) : QListView(zsafe, id)
12{ 10{
13 zs = zsafe; 11 zs = zsafe;
14} 12}
15 13
16ZListView::~ZListView() 14ZListView::~ZListView()
17{ 15{
18} 16}
19 17
20void ZListView::keyPressEvent ( QKeyEvent *e ) 18void ZListView::keyPressEvent ( QKeyEvent *e )
21{ 19{
22/* 20/*
23 char buf[64]; 21 char buf[64];
24 sprintf (buf, "key: %d\n", e->key()); 22 sprintf (buf, "key: %d\n", e->key());
25 qWarning (buf); 23 qWarning (buf);
26*/ 24*/
27 25
28 switch (e->key()) 26 switch (e->key())
29 { 27 {
30 case 32: // middle cursor key pressed 28 case 32: // middle cursor key pressed
31 zs->showInfo (zs->selectedItem); 29 zs->showInfo (zs->selectedItem);
32 break; 30 break;
33 default: 31 default:
34 QListView::keyPressEvent( e ); 32 QListView::keyPressEvent( e );
35 } 33 }
36 34
37} 35}
38 36
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index f43a206..a3e805e 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -34,97 +34,96 @@ using Opie::OFileDialog;
34using Opie::OFileSelector; 34using Opie::OFileSelector;
35#else 35#else
36#include "scqtfileedit.h" 36#include "scqtfileedit.h"
37#endif 37#endif
38#endif 38#endif
39 39
40#include <qclipboard.h> 40#include <qclipboard.h>
41 41
42#include <stdio.h> 42#include <stdio.h>
43 43
44#include <sys/types.h> 44#include <sys/types.h>
45#include <sys/stat.h> 45#include <sys/stat.h>
46#include <fcntl.h> 46#include <fcntl.h>
47#include <stdlib.h> 47#include <stdlib.h>
48#ifndef WIN32 48#ifndef WIN32
49#include <unistd.h> 49#include <unistd.h>
50#endif 50#endif
51#include <string.h> 51#include <string.h>
52#include <errno.h> 52#include <errno.h>
53 53
54#include <qmenubar.h> 54#include <qmenubar.h>
55#include <qpopupmenu.h> 55#include <qpopupmenu.h>
56 56
57#ifdef DESKTOP 57#ifdef DESKTOP
58#include <qfiledialog.h> 58#include <qfiledialog.h>
59#ifndef WIN32 59#ifndef WIN32
60#include <qsettings.h> 60#include <qsettings.h>
61#else 61#else
62#include "qsettings.h" 62#include "qsettings.h"
63#endif 63#endif
64#include <qapplication.h> 64#include <qapplication.h>
65#else 65#else
66#include <qfile.h> 66#include <qfile.h>
67#include <qpe/fileselector.h> 67#include <qpe/fileselector.h>
68#include <qpe/global.h> 68#include <qpe/global.h>
69#include <qpe/qpeapplication.h> 69#include <qpe/qpeapplication.h>
70#include <qpe/resource.h> 70#include <qpe/resource.h>
71#include <qpe/config.h> 71#include <qpe/config.h>
72#endif 72#endif
73 73
74#include <qtimer.h> 74#include <qtimer.h>
75#include <qlayout.h> 75#include <qlayout.h>
76#include <qmessagebox.h> 76#include <qmessagebox.h>
77#include <qfile.h> 77#include <qfile.h>
78#include <qtextstream.h> 78#include <qtextstream.h>
79#include <qheader.h> 79#include <qheader.h>
80#include <qlistview.h> 80#include <qlistview.h>
81#include <qtoolbutton.h> 81#include <qtoolbutton.h>
82#include <qlayout.h>
83#include <qvariant.h> 82#include <qvariant.h>
84#include <qtooltip.h> 83#include <qtooltip.h>
85#include <qwhatsthis.h> 84#include <qwhatsthis.h>
86#include <qimage.h> 85#include <qimage.h>
87#include <qpixmap.h> 86#include <qpixmap.h>
88#include <qlineedit.h> 87#include <qlineedit.h>
89#include <qmultilineedit.h> 88#include <qmultilineedit.h>
90#include <qregexp.h> 89#include <qregexp.h>
91#include <qdir.h> 90#include <qdir.h>
92#include <qtextbrowser.h> 91#include <qtextbrowser.h>
93#include <qlabel.h> 92#include <qlabel.h>
94#include <qcombobox.h> 93#include <qcombobox.h>
95 94
96#include "krc2.h" 95#include "krc2.h"
97 96
98#include "wait.h" 97#include "wait.h"
99 98
100extern int DeskW, DeskH; 99extern int DeskW, DeskH;
101#ifdef DESKTOP 100#ifdef DESKTOP
102extern QApplication *appl; 101extern QApplication *appl;
103#else 102#else
104extern QPEApplication *appl; 103extern QPEApplication *appl;
105#endif 104#endif
106 105
107#ifdef JPATCH_HDE 106#ifdef JPATCH_HDE
108#define tr(arg) arg 107#define tr(arg) arg
109#endif 108#endif
110 109
111 110
112#ifdef DESKTOP 111#ifdef DESKTOP
113#ifndef WIN32 112#ifndef WIN32
114const QString APP_KEY="/.zsafe/"; 113const QString APP_KEY="/.zsafe/";
115#else 114#else
116const QString APP_KEY=""; 115const QString APP_KEY="";
117#endif 116#endif
118#else 117#else
119const QString APP_KEY=""; 118const QString APP_KEY="";
120#endif 119#endif
121 120
122// include xmp images 121// include xmp images
123#include "pics/zsafe/copy.xpm" 122#include "pics/zsafe/copy.xpm"
124#include "pics/zsafe/cut.xpm" 123#include "pics/zsafe/cut.xpm"
125#include "pics/zsafe/edit.xpm" 124#include "pics/zsafe/edit.xpm"
126#include "pics/zsafe/editdelete.xpm" 125#include "pics/zsafe/editdelete.xpm"
127#include "pics/zsafe/find.xpm" 126#include "pics/zsafe/find.xpm"
128#include "pics/zsafe/folder_open.xpm" 127#include "pics/zsafe/folder_open.xpm"
129#include "pics/zsafe/help_icon.xpm" 128#include "pics/zsafe/help_icon.xpm"
130#include "pics/zsafe/new.xpm" 129#include "pics/zsafe/new.xpm"
diff --git a/noncore/comm/keypebble/krfbbuffer.cpp b/noncore/comm/keypebble/krfbbuffer.cpp
index f1cb929..92918d4 100644
--- a/noncore/comm/keypebble/krfbbuffer.cpp
+++ b/noncore/comm/keypebble/krfbbuffer.cpp
@@ -1,58 +1,55 @@
1#include <assert.h> 1#include <assert.h>
2#include <qpixmap.h>
3#include <qbrush.h>
4#include <qimage.h> 2#include <qimage.h>
5#include <qpainter.h> 3#include <qpainter.h>
6#include <qapplication.h> 4#include <qapplication.h>
7#include "krfbdecoder.h" 5#include "krfbdecoder.h"
8#include "krfbbuffer.h" 6#include "krfbbuffer.h"
9#include "krfbconnection.h" 7#include "krfbconnection.h"
10#include "krfbserver.h"
11#include "krfbserverinfo.h" 8#include "krfbserverinfo.h"
12 9
13// 10//
14// Endian stuff 11// Endian stuff
15// 12//
16#ifndef KDE_USE_FINAL 13#ifndef KDE_USE_FINAL
17const int endianTest = 1; 14const int endianTest = 1;
18#endif 15#endif
19 16
20#define Swap16IfLE(s) \ 17#define Swap16IfLE(s) \
21 (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s)) 18 (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
22 19
23#define Swap32IfLE(l) \ 20#define Swap32IfLE(l) \
24 (*(char *)&endianTest ? ((((l) & 0xff000000) >> 24) | \ 21 (*(char *)&endianTest ? ((((l) & 0xff000000) >> 24) | \
25 (((l) & 0x00ff0000) >> 8) | \ 22 (((l) & 0x00ff0000) >> 8) | \
26 (((l) & 0x0000ff00) << 8) | \ 23 (((l) & 0x0000ff00) << 8) | \
27 (((l) & 0x000000ff) << 24)) : (l)) 24 (((l) & 0x000000ff) << 24)) : (l))
28 25
29KRFBBuffer::KRFBBuffer( KRFBDecoder *decoder, 26KRFBBuffer::KRFBBuffer( KRFBDecoder *decoder,
30 QObject *parent, const char *name ) 27 QObject *parent, const char *name )
31 : QObject( parent, name ) 28 : QObject( parent, name )
32{ 29{
33 assert( decoder ); 30 assert( decoder );
34 this->decoder = decoder; 31 this->decoder = decoder;
35 pix = new QPixmap(); 32 pix = new QPixmap();
36} 33}
37 34
38KRFBBuffer::~KRFBBuffer() 35KRFBBuffer::~KRFBBuffer()
39{ 36{
40 delete pix; 37 delete pix;
41} 38}
42 39
43void KRFBBuffer::resize( int w, int h ) 40void KRFBBuffer::resize( int w, int h )
44{ 41{
45 qWarning( "Resizing buffer" ); 42 qWarning( "Resizing buffer" );
46 43
47 pix->resize( w, h ); 44 pix->resize( w, h );
48 45
49 QPalette pal = qApp->palette(); 46 QPalette pal = qApp->palette();
50 pix->fill( pal.active().base() ); 47 pix->fill( pal.active().base() );
51 48
52 emit sizeChanged( w, h ); 49 emit sizeChanged( w, h );
53} 50}
54 51
55void KRFBBuffer::soundBell() 52void KRFBBuffer::soundBell()
56{ 53{
57 emit bell(); 54 emit bell();
58} 55}
diff --git a/noncore/comm/keypebble/krfbcanvas.cpp b/noncore/comm/keypebble/krfbcanvas.cpp
index bc71c90..75cba68 100644
--- a/noncore/comm/keypebble/krfbcanvas.cpp
+++ b/noncore/comm/keypebble/krfbcanvas.cpp
@@ -1,64 +1,55 @@
1#include "krfbconnection.h" 1#include "krfbconnection.h"
2#include "krfbcanvas.h" 2#include "krfbcanvas.h"
3#include "krfbserver.h"
4#include "krfbbuffer.h" 3#include "krfbbuffer.h"
5 4
6#include <qpe/config.h>
7#include <qpe/qpeapplication.h> 5#include <qpe/qpeapplication.h>
8 6
9#include <qapplication.h>
10#include <qclipboard.h> 7#include <qclipboard.h>
11#include <qaction.h>
12#include <qpixmap.h>
13#include <qpoint.h>
14#include <qapplication.h>
15#include <qmainwindow.h>
16#include <qiconset.h>
17 8
18KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name ) 9KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name )
19 : QScrollView( parent, name ) 10 : QScrollView( parent, name )
20{ 11{
21 connection_ = new KRFBConnection(); 12 connection_ = new KRFBConnection();
22 connect( connection_, SIGNAL( loggedIn() ), 13 connect( connection_, SIGNAL( loggedIn() ),
23 this, SLOT( loggedIn() ) ); 14 this, SLOT( loggedIn() ) );
24 15
25 loggedIn_ = false; 16 loggedIn_ = false;
26 17
27 //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold); 18 //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold);
28 19
29 viewport()->setFocusPolicy( QWidget::StrongFocus ); 20 viewport()->setFocusPolicy( QWidget::StrongFocus );
30 viewport()->setFocus(); 21 viewport()->setFocus();
31 22
32 nextRightClick=0; 23 nextRightClick=0;
33 nextDoubleClick=0; 24 nextDoubleClick=0;
34} 25}
35 26
36KRFBCanvas::~KRFBCanvas() 27KRFBCanvas::~KRFBCanvas()
37{ 28{
38} 29}
39 30
40 31
41void KRFBCanvas::openConnection(KRFBServer server) 32void KRFBCanvas::openConnection(KRFBServer server)
42{ 33{
43 34
44 35
45 QCString host = server.hostname.latin1(); 36 QCString host = server.hostname.latin1();
46 password=server.password; 37 password=server.password;
47 connection_->connectTo( server); 38 connection_->connectTo( server);
48} 39}
49 40
50 41
51void KRFBCanvas::openURL( const QUrl &url ) 42void KRFBCanvas::openURL( const QUrl &url )
52{ 43{
53 if ( loggedIn_ ) { 44 if ( loggedIn_ ) {
54 qWarning( "openURL invoked when logged in\n" ); 45 qWarning( "openURL invoked when logged in\n" );
55 return; 46 return;
56 } 47 }
57 48
58 QCString host = url.host().latin1(); 49 QCString host = url.host().latin1();
59 int display = url.port(); 50 int display = url.port();
60 51
61// connection_->connectTo( host, display ); 52// connection_->connectTo( host, display );
62} 53}
63 54
64void KRFBCanvas::closeConnection() 55void KRFBCanvas::closeConnection()
diff --git a/noncore/comm/keypebble/krfbconnection.cpp b/noncore/comm/keypebble/krfbconnection.cpp
index 389c836..e6c33c6 100644
--- a/noncore/comm/keypebble/krfbconnection.cpp
+++ b/noncore/comm/keypebble/krfbconnection.cpp
@@ -1,56 +1,55 @@
1#include <assert.h> 1#include <assert.h>
2#include <qsocket.h> 2#include <qsocket.h>
3#include <qtimer.h> 3#include <qtimer.h>
4#include <string.h> 4#include <string.h>
5 5
6#include "krfbconnection.h" 6#include "krfbconnection.h"
7#include "krfblogin.h" 7#include "krfblogin.h"
8#include "krfbserver.h"
9#include "krfbdecoder.h" 8#include "krfbdecoder.h"
10#include "krfbbuffer.h" 9#include "krfbbuffer.h"
11 10
12KRFBConnection::KRFBConnection( QObject *parent ) 11KRFBConnection::KRFBConnection( QObject *parent )
13 : QObject( parent, "KRFBConnection" ) 12 : QObject( parent, "KRFBConnection" )
14{ 13{
15 portBase_ = 5900; 14 portBase_ = 5900;
16 currentState_ = Disconnected; 15 currentState_ = Disconnected;
17 sock = 0; 16 sock = 0;
18 minData_ = 0; 17 minData_ = 0;
19 options_ = new KRFBServer(); 18 options_ = new KRFBServer();
20 updater = 0; 19 updater = 0;
21 decoder_ = 0; 20 decoder_ = 0;
22 buffer_ = 0; 21 buffer_ = 0;
23} 22}
24 23
25KRFBConnection::~KRFBConnection() 24KRFBConnection::~KRFBConnection()
26{ 25{
27 if ( ( currentState_ != Disconnected ) && ( currentState_ != Disconnecting ) && sock ) { 26 if ( ( currentState_ != Disconnected ) && ( currentState_ != Disconnecting ) && sock ) {
28 disconnectDone(); 27 disconnectDone();
29 } 28 }
30 delete options_; 29 delete options_;
31} 30}
32 31
33void KRFBConnection::connectTo( KRFBServer server) 32void KRFBConnection::connectTo( KRFBServer server)
34{ 33{
35 if ( currentState_ != Disconnected ) 34 if ( currentState_ != Disconnected )
36 disconnect(); 35 disconnect();
37 36
38 (*options_)=server; 37 (*options_)=server;
39 38
40 sock = new QSocket( this, "rfbSocket" ); 39 sock = new QSocket( this, "rfbSocket" );
41 CHECK_PTR( sock ); 40 CHECK_PTR( sock );
42 41
43 // Connect to something to notice connection or error 42 // Connect to something to notice connection or error
44 connect( sock, SIGNAL( error( int ) ), SLOT( gotSocketError( int ) ) ); 43 connect( sock, SIGNAL( error( int ) ), SLOT( gotSocketError( int ) ) );
45 connect( sock, SIGNAL( connected() ), SLOT( gotSocketConnection() ) ); 44 connect( sock, SIGNAL( connected() ), SLOT( gotSocketConnection() ) );
46 45
47 qWarning( "Connecting..." ); 46 qWarning( "Connecting..." );
48 47
49 currentState_ = Connecting; 48 currentState_ = Connecting;
50 sock->connectToHost( options_->hostname.latin1(), portBase_ + options_->display ); 49 sock->connectToHost( options_->hostname.latin1(), portBase_ + options_->display );
51} 50}
52 51
53void KRFBConnection::disconnect() 52void KRFBConnection::disconnect()
54{ 53{
55 qWarning( "Disconnecting from server" ); 54 qWarning( "Disconnecting from server" );
56 55
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index c43aed5..2c9ad71 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -1,61 +1,55 @@
1#include "krfbconnection.h" 1#include "krfbconnection.h"
2#include "krfbserver.h"
3#include "krfbserverinfo.h" 2#include "krfbserverinfo.h"
4#include "krfbdecoder.h" 3#include "krfbdecoder.h"
5#include "krfbbuffer.h" 4#include "krfbbuffer.h"
6 5
7#include <qpe/qpeapplication.h>
8 6
9#include <qpixmap.h> 7#include <qpixmap.h>
10#include <qsocket.h>
11#include <qevent.h>
12#include <qstring.h>
13#include <qclipboard.h>
14 8
15#include <assert.h> 9#include <assert.h>
16 10
17// 11//
18// Endian stuff 12// Endian stuff
19// 13//
20#ifndef KDE_USE_FINAL 14#ifndef KDE_USE_FINAL
21const int endianTest = 1; 15const int endianTest = 1;
22#endif 16#endif
23 17
24#define Swap16IfLE(s) \ 18#define Swap16IfLE(s) \
25 (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s)) 19 (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
26 20
27#define Swap32IfLE(l) \ 21#define Swap32IfLE(l) \
28 (*(char *)&endianTest ? ((((l) & 0xff000000) >> 24) | \ 22 (*(char *)&endianTest ? ((((l) & 0xff000000) >> 24) | \
29 (((l) & 0x00ff0000) >> 8) | \ 23 (((l) & 0x00ff0000) >> 8) | \
30 (((l) & 0x0000ff00) << 8) | \ 24 (((l) & 0x0000ff00) << 8) | \
31 (((l) & 0x000000ff) << 24)) : (l)) 25 (((l) & 0x000000ff) << 24)) : (l))
32 26
33// 27//
34// The lengths of the messages we need to wait for 28// The lengths of the messages we need to wait for
35// 29//
36const int ServerInitLength = 24; 30const int ServerInitLength = 24;
37const int UpdateHeaderLength = 4; 31const int UpdateHeaderLength = 4;
38const int RectHeaderLength = 12; 32const int RectHeaderLength = 12;
39const int RectChunkSize = 4; 33const int RectChunkSize = 4;
40const int CopyRectPosLength = 4; 34const int CopyRectPosLength = 4;
41const int ServerCutLenLength = 7; 35const int ServerCutLenLength = 7;
42 36
43// 37//
44// Client -> Server Message Identifiers 38// Client -> Server Message Identifiers
45// 39//
46static CARD8 SetPixelFormatId = 0; 40static CARD8 SetPixelFormatId = 0;
47//static CARD8 FixColourMapEntriesId = 1; // Not used 41//static CARD8 FixColourMapEntriesId = 1; // Not used
48static CARD8 SetEncodingsId = 2; 42static CARD8 SetEncodingsId = 2;
49static CARD8 UpdateRequestId = 3; 43static CARD8 UpdateRequestId = 3;
50static CARD8 KeyEventId = 4; 44static CARD8 KeyEventId = 4;
51static CARD8 PointerEventId = 5; 45static CARD8 PointerEventId = 5;
52static CARD8 ClientCutTextId = 6; 46static CARD8 ClientCutTextId = 6;
53 47
54// 48//
55// Server -> Client Message Identifiers 49// Server -> Client Message Identifiers
56// 50//
57static CARD8 UpdateId = 0; 51static CARD8 UpdateId = 0;
58static CARD8 BellId = 2; 52static CARD8 BellId = 2;
59static CARD8 ServerCutId = 3; 53static CARD8 ServerCutId = 3;
60 54
61// 55//
diff --git a/noncore/comm/keypebble/krfblogin.cpp b/noncore/comm/keypebble/krfblogin.cpp
index 0d2a205..0b4a757 100644
--- a/noncore/comm/keypebble/krfblogin.cpp
+++ b/noncore/comm/keypebble/krfblogin.cpp
@@ -1,59 +1,58 @@
1#include <assert.h> 1#include <assert.h>
2 2
3 3
4extern "C" { 4extern "C" {
5#include "vncauth.h" 5#include "vncauth.h"
6} 6}
7 7
8#include "krfblogin.h" 8#include "krfblogin.h"
9#include "krfbconnection.h" 9#include "krfbconnection.h"
10#include <qtimer.h> 10#include <qtimer.h>
11#include <qregexp.h>
12 11
13// The length of the various messages (used to decide how many bytes to 12// The length of the various messages (used to decide how many bytes to
14// wait for). 13// wait for).
15const int ServerVersionLength = 12; 14const int ServerVersionLength = 12;
16const int ClientVersionLength = 12; 15const int ClientVersionLength = 12;
17const int AuthSchemeLength = 4; 16const int AuthSchemeLength = 4;
18const int FailureReasonSizeLength = 4; 17const int FailureReasonSizeLength = 4;
19const int ChallengeLength = 16; 18const int ChallengeLength = 16;
20const int AuthResultLength = 4; 19const int AuthResultLength = 4;
21 20
22// Authentication results 21// Authentication results
23enum AuthResult { 22enum AuthResult {
24 AuthOk, 23 AuthOk,
25 AuthFailed, 24 AuthFailed,
26 AuthTooMany 25 AuthTooMany
27}; 26};
28 27
29typedef unsigned char CARD8; 28typedef unsigned char CARD8;
30typedef unsigned short CARD16; 29typedef unsigned short CARD16;
31typedef unsigned long CARD32; 30typedef unsigned long CARD32;
32 31
33const int endianTest = 1; 32const int endianTest = 1;
34 33
35// Endian stuff 34// Endian stuff
36#define Swap16IfLE(s) \ 35#define Swap16IfLE(s) \
37 (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s)) 36 (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
38 37
39#define Swap32IfLE(l) \ 38#define Swap32IfLE(l) \
40 (*(char *)&endianTest ? ((((l) & 0xff000000) >> 24) | \ 39 (*(char *)&endianTest ? ((((l) & 0xff000000) >> 24) | \
41 (((l) & 0x00ff0000) >> 8) | \ 40 (((l) & 0x00ff0000) >> 8) | \
42 (((l) & 0x0000ff00) << 8) | \ 41 (((l) & 0x0000ff00) << 8) | \
43 (((l) & 0x000000ff) << 24)) : (l)) 42 (((l) & 0x000000ff) << 24)) : (l))
44 43
45KRFBLogin::KRFBLogin( KRFBConnection *con ) 44KRFBLogin::KRFBLogin( KRFBConnection *con )
46 : QObject( con, "RFB login manager" ) 45 : QObject( con, "RFB login manager" )
47{ 46{
48 assert( con ); 47 assert( con );
49 this->con = con; 48 this->con = con;
50 currentState = AwaitingServerVersion; 49 currentState = AwaitingServerVersion;
51 50
52 connect( this, SIGNAL( error( const QString & ) ), 51 connect( this, SIGNAL( error( const QString & ) ),
53 con, SIGNAL( error( const QString & ) ) ); 52 con, SIGNAL( error( const QString & ) ) );
54 53
55 54
56 qWarning( "Waiting for server version..." ); 55 qWarning( "Waiting for server version..." );
57 56
58 static QString statusMsg = tr( "Waiting for server version..." ); 57 static QString statusMsg = tr( "Waiting for server version..." );
59 emit status( statusMsg ); 58 emit status( statusMsg );
diff --git a/noncore/comm/keypebble/krfbserver.cpp b/noncore/comm/keypebble/krfbserver.cpp
index b47534e..fda81a1 100644
--- a/noncore/comm/keypebble/krfbserver.cpp
+++ b/noncore/comm/keypebble/krfbserver.cpp
@@ -1,41 +1,40 @@
1#include <qpe/config.h>
2#include <qpe/qpeapplication.h> 1#include <qpe/qpeapplication.h>
3#include "krfbserver.h" 2#include "krfbserver.h"
4 3
5KRFBServer::KRFBServer() 4KRFBServer::KRFBServer()
6{ 5{
7 QString name; 6 QString name;
8 QString hostname; 7 QString hostname;
9 QString password; 8 QString password;
10 display=0; 9 display=0;
11 10
12 scaleFactor=1; 11 scaleFactor=1;
13 12
14 hexTile=0; 13 hexTile=0;
15 corre=0; 14 corre=0;
16 rre=0; 15 rre=0;
17 copyrect=1; 16 copyrect=1;
18 17
19 colors256=1; 18 colors256=1;
20 shared=0; 19 shared=0;
21 readOnly=0; 20 readOnly=0;
22 deIconify=0; 21 deIconify=0;
23 22
24 updateRate=0; 23 updateRate=0;
25} 24}
26KRFBServer::~KRFBServer() 25KRFBServer::~KRFBServer()
27{ 26{
28} 27}
29 28
30int KRFBServer::encodings() 29int KRFBServer::encodings()
31{ 30{
32 // Initially one because we always support raw encoding 31 // Initially one because we always support raw encoding
33 int count = 1; 32 int count = 1;
34 33
35 count += hexTile ? 1 : 0; 34 count += hexTile ? 1 : 0;
36 count += corre ? 1 : 0; 35 count += corre ? 1 : 0;
37 count += rre ? 1 : 0; 36 count += rre ? 1 : 0;
38 count += copyrect ? 1 : 0; 37 count += copyrect ? 1 : 0;
39 38
40 return count; 39 return count;
41} 40}
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index 2fa8d1f..c678edf 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -1,75 +1,62 @@
1#include <qiconset.h>
2#include <qdialog.h>
3#include <qpixmap.h>
4#include <qdom.h>
5#include <qaction.h> 1#include <qaction.h>
6#include <qmenubar.h>
7#include <qstatusbar.h>
8#include <qpopupmenu.h> 2#include <qpopupmenu.h>
9#include <qpushbutton.h> 3#include <qpushbutton.h>
10#include <qpe/qpetoolbar.h>
11#include <qtimer.h>
12#include <qmessagebox.h> 4#include <qmessagebox.h>
13#include <qspinbox.h>
14#include <qlistbox.h> 5#include <qlistbox.h>
15#include <qlineedit.h>
16#include <qpe/qpeapplication.h> 6#include <qpe/qpeapplication.h>
17#include <qpe/global.h>
18#include <qpe/qpetoolbar.h>
19#include <qpe/resource.h> 7#include <qpe/resource.h>
20 8
21#include <assert.h> 9#include <assert.h>
22 10
23#include "kvnc.h" 11#include "kvnc.h"
24#include "krfbcanvas.h" 12#include "krfbcanvas.h"
25#include "krfbconnection.h" 13#include "krfbconnection.h"
26#include "kvncconndlg.h" 14#include "kvncconndlg.h"
27#include "krfbserver.h"
28 15
29static int u_id = 1; 16static int u_id = 1;
30static int get_unique_id() 17static int get_unique_id()
31{ 18{
32 return u_id++; 19 return u_id++;
33} 20}
34 21
35 22
36/* XPM */ 23/* XPM */
37static char * menu_xpm[] = { 24static char * menu_xpm[] = {
38"12 12 5 1", 25"12 12 5 1",
39 " c None", 26 " c None",
40 ".c #000000", 27 ".c #000000",
41 "+c #FFFDAD", 28 "+c #FFFDAD",
42 "@c #FFFF00", 29 "@c #FFFF00",
43 "#c #E5E100", 30 "#c #E5E100",
44" ", 31" ",
45" ", 32" ",
46" ......... ", 33" ......... ",
47" .+++++++. ", 34" .+++++++. ",
48" .+@@@@#. ", 35" .+@@@@#. ",
49" .+@@@#. ", 36" .+@@@#. ",
50" .+@@#. ", 37" .+@@#. ",
51" .+@#. ", 38" .+@#. ",
52" .+#. ", 39" .+#. ",
53" .+. ", 40" .+. ",
54" .. ", 41" .. ",
55" "}; 42" "};
56 43
57const int StatusTextId = 0; 44const int StatusTextId = 0;
58 45
59KVNC::KVNC( QWidget *parent, const char *name, WFlags f) : QMainWindow( 0, name ,WStyle_ContextHelp) 46KVNC::KVNC( QWidget *parent, const char *name, WFlags f) : QMainWindow( 0, name ,WStyle_ContextHelp)
60{ 47{
61 setCaption( tr("VNC Viewer") ); 48 setCaption( tr("VNC Viewer") );
62 fullscreen = false; 49 fullscreen = false;
63 50
64 stack = new QWidgetStack( this ); 51 stack = new QWidgetStack( this );
65 setCentralWidget( stack ); 52 setCentralWidget( stack );
66 53
67 bookmarkSelector=new KVNCBookmarkDlg(); 54 bookmarkSelector=new KVNCBookmarkDlg();
68 stack->addWidget(bookmarkSelector,get_unique_id()); 55 stack->addWidget(bookmarkSelector,get_unique_id());
69 stack->raiseWidget( bookmarkSelector ); 56 stack->raiseWidget( bookmarkSelector );
70 57
71 canvas = new KRFBCanvas( stack, "canvas" ); 58 canvas = new KRFBCanvas( stack, "canvas" );
72 stack->addWidget(canvas,get_unique_id()); 59 stack->addWidget(canvas,get_unique_id());
73 setCentralWidget( stack ); 60 setCentralWidget( stack );
74 61
75 62
diff --git a/noncore/comm/keypebble/kvncbookmarkdlg.cpp b/noncore/comm/keypebble/kvncbookmarkdlg.cpp
index 8556d49..ef2fa12 100644
--- a/noncore/comm/keypebble/kvncbookmarkdlg.cpp
+++ b/noncore/comm/keypebble/kvncbookmarkdlg.cpp
@@ -1,66 +1,52 @@
1#include <qframe.h>
2#include <qvbox.h>
3#include <qcheckbox.h>
4#include <qspinbox.h>
5#include <qlabel.h>
6#include <qlayout.h>
7#include <qwhatsthis.h>
8#include <qfile.h>
9#include <qdir.h> 1#include <qdir.h>
10#include <qstring.h>
11#include <qapplication.h>
12#include <qlineedit.h>
13#include <qtextstream.h> 2#include <qtextstream.h>
14#include <qpushbutton.h>
15#include <qlistbox.h> 3#include <qlistbox.h>
16#include <qpe/config.h>
17#include <qpe/global.h> 4#include <qpe/global.h>
18#include "krfbserver.h"
19#include "kvncbookmarkdlg.h" 5#include "kvncbookmarkdlg.h"
20 6
21KVNCBookmarkDlg::KVNCBookmarkDlg( QWidget * parent, const char * name, WFlags f ) 7KVNCBookmarkDlg::KVNCBookmarkDlg( QWidget * parent, const char * name, WFlags f )
22 8
23: KVNCBookmarkDlgBase( parent, name,f) 9: KVNCBookmarkDlgBase( parent, name,f)
24{ 10{
25 readBookmarks(); 11 readBookmarks();
26 refresh(); 12 refresh();
27 13
28} 14}
29 15
30KVNCBookmarkDlg::~KVNCBookmarkDlg() 16KVNCBookmarkDlg::~KVNCBookmarkDlg()
31{ 17{
32} 18}
33 19
34void KVNCBookmarkDlg::addBookmark(KRFBServer * server) 20void KVNCBookmarkDlg::addBookmark(KRFBServer * server)
35{ 21{
36 if (server) { 22 if (server) {
37 servers.append(server); 23 servers.append(server);
38 bookmarkList->insertItem(server->name); 24 bookmarkList->insertItem(server->name);
39 writeBookmarks(); 25 writeBookmarks();
40 refresh(); 26 refresh();
41 } 27 }
42} 28}
43 29
44void KVNCBookmarkDlg::deleteBookmark(QString name) 30void KVNCBookmarkDlg::deleteBookmark(QString name)
45{ 31{
46 KRFBServer * server=0; 32 KRFBServer * server=0;
47 for ( server=servers.first(); server != 0; server=servers.next() ) { 33 for ( server=servers.first(); server != 0; server=servers.next() ) {
48 if (server->name==name) { 34 if (server->name==name) {
49 servers.remove(servers.at()); 35 servers.remove(servers.at());
50 writeBookmarks(); 36 writeBookmarks();
51 refresh(); 37 refresh();
52 return; 38 return;
53 } 39 }
54 } 40 }
55} 41}
56KRFBServer *KVNCBookmarkDlg::getServer(QString name) 42KRFBServer *KVNCBookmarkDlg::getServer(QString name)
57{ 43{
58 KRFBServer * server=0; 44 KRFBServer * server=0;
59 for ( server=servers.first(); server != 0; server=servers.next() ) { 45 for ( server=servers.first(); server != 0; server=servers.next() ) {
60 if (server->name==name) 46 if (server->name==name)
61 47
62 return server; 48 return server;
63 } 49 }
64 return 0; 50 return 0;
65} 51}
66 52
diff --git a/noncore/comm/keypebble/kvncconndlg.cpp b/noncore/comm/keypebble/kvncconndlg.cpp
index cd55bb0..420c816 100644
--- a/noncore/comm/keypebble/kvncconndlg.cpp
+++ b/noncore/comm/keypebble/kvncconndlg.cpp
@@ -1,60 +1,52 @@
1#include <qframe.h>
2#include <qvbox.h>
3#include <qcheckbox.h> 1#include <qcheckbox.h>
4#include <qcombobox.h> 2#include <qcombobox.h>
5#include <qspinbox.h> 3#include <qspinbox.h>
6#include <qlabel.h>
7#include <qlayout.h>
8#include <qwhatsthis.h>
9#include <qapplication.h>
10#include <qlineedit.h> 4#include <qlineedit.h>
11#include <qpushbutton.h>
12#include "krfbserver.h"
13 5
14#include "kvncconndlg.h" 6#include "kvncconndlg.h"
15 7
16KVNCConnDlg::KVNCConnDlg( KRFBServer *options, 8KVNCConnDlg::KVNCConnDlg( KRFBServer *options,
17 QWidget *parent, char *name, bool modal ) 9 QWidget *parent, char *name, bool modal )
18: KVNCConnDlgBase( parent, name, modal, WStyle_ContextHelp ) 10: KVNCConnDlgBase( parent, name, modal, WStyle_ContextHelp )
19{ 11{
20 this->options=options; 12 this->options=options;
21 tmpOptions=*options; 13 tmpOptions=*options;
22 14
23 serverHostname->setText(options->hostname); 15 serverHostname->setText(options->hostname);
24 serverDisplay->setValue(options->display); 16 serverDisplay->setValue(options->display);
25 serverPassword->setText(options->password); 17 serverPassword->setText(options->password);
26 serverBookmark->setText(options->name); 18 serverBookmark->setText(options->name);
27 19
28 hex->setChecked( options->hexTile ); 20 hex->setChecked( options->hexTile );
29 corre->setChecked( options->corre ); 21 corre->setChecked( options->corre );
30 rre->setChecked( options->rre ); 22 rre->setChecked( options->rre );
31 copyRect->setChecked( options->copyrect ); 23 copyRect->setChecked( options->copyrect );
32 24
33 for (int i=0; i < scaleFactor->count(); ++i) { 25 for (int i=0; i < scaleFactor->count(); ++i) {
34 if (scaleFactor->text(i).toInt()==tmpOptions.scaleFactor) { 26 if (scaleFactor->text(i).toInt()==tmpOptions.scaleFactor) {
35 scaleFactor->setCurrentItem(i); 27 scaleFactor->setCurrentItem(i);
36 } 28 }
37 } 29 }
38 30
39 // TODO 31 // TODO
40 hex->setEnabled( false ); 32 hex->setEnabled( false );
41 corre->setEnabled( false ); 33 corre->setEnabled( false );
42 rre->setEnabled( false ); 34 rre->setEnabled( false );
43 // /TODO 35 // /TODO
44 36
45 deIconify->setChecked( options->deIconify ); 37 deIconify->setChecked( options->deIconify );
46 bit->setChecked( options->colors256 ); 38 bit->setChecked( options->colors256 );
47 shared->setChecked( options->shared ); 39 shared->setChecked( options->shared );
48 timeBox->setValue( options->updateRate ); 40 timeBox->setValue( options->updateRate );
49 41
50 serverPassword->setEchoMode(QLineEdit::Password); 42 serverPassword->setEchoMode(QLineEdit::Password);
51 43
52 connect(togglePassword, SIGNAL( stateChanged(int) ), this, SLOT( showPassword(int) ) ); 44 connect(togglePassword, SIGNAL( stateChanged(int) ), this, SLOT( showPassword(int) ) );
53 45
54 46
55} 47}
56KVNCConnDlg::~KVNCConnDlg() 48KVNCConnDlg::~KVNCConnDlg()
57{ 49{
58} 50}
59 51
60void KVNCConnDlg::accept() 52void KVNCConnDlg::accept()
diff --git a/noncore/comm/keypebble/main.cpp b/noncore/comm/keypebble/main.cpp
index 11f67fc..fc34099 100644
--- a/noncore/comm/keypebble/main.cpp
+++ b/noncore/comm/keypebble/main.cpp
@@ -1,10 +1,9 @@
1 1
2 2
3 3
4#include <qpe/qpeapplication.h>
5#include "kvnc.h" 4#include "kvnc.h"
6#include <opie/oapplicationfactory.h> 5#include <opie/oapplicationfactory.h>
7 6
8 7
9 8
10OPIE_EXPORT_APP( OApplicationFactory<KVNC> ) 9OPIE_EXPORT_APP( OApplicationFactory<KVNC> )
diff --git a/noncore/comm/mobilemsg/mobilemsg.cpp b/noncore/comm/mobilemsg/mobilemsg.cpp
index 707872e..9a4db35 100644
--- a/noncore/comm/mobilemsg/mobilemsg.cpp
+++ b/noncore/comm/mobilemsg/mobilemsg.cpp
@@ -1,38 +1,33 @@
1#include "mobilemsg.h" 1#include "mobilemsg.h"
2#include <qpushbutton.h>
3 2
4#include <qpe/qpeapplication.h>
5 3
6#include <qlistbox.h>
7#include <qpushbutton.h>
8#include <qlayout.h>
9 4
10 5
11/* 6/*
12 * Constructs a MobileMsg which is a child of 'parent', with the 7 * Constructs a MobileMsg which is a child of 'parent', with the
13 * name 'name' and widget flags set to 'f' 8 * name 'name' and widget flags set to 'f'
14 */ 9 */
15MobileMsg::MobileMsg( QWidget* parent, const char* name, WFlags fl ) 10MobileMsg::MobileMsg( QWidget* parent, const char* name, WFlags fl )
16 : MobileMsgBase( parent, name, fl ) 11 : MobileMsgBase( parent, name, fl )
17{ 12{
18 //connect(add, SIGNAL(clicked()), this, SLOT(goodBye())); 13 //connect(add, SIGNAL(clicked()), this, SLOT(goodBye()));
19 //connect(remove, SIGNAL(clicked()), this, SLOT(goodBye())); 14 //connect(remove, SIGNAL(clicked()), this, SLOT(goodBye()));
20 //connect(props, SIGNAL(clicked()), this, SLOT(goodBye())); 15 //connect(props, SIGNAL(clicked()), this, SLOT(goodBye()));
21 //connect(settings, SIGNAL(selectionChanged()), this, SLOT(goodBye()) ); 16 //connect(settings, SIGNAL(selectionChanged()), this, SLOT(goodBye()) );
22} 17}
23 18
24/* 19/*
25 * Destroys the object and frees any allocated resources 20 * Destroys the object and frees any allocated resources
26 */ 21 */
27MobileMsg::~MobileMsg() 22MobileMsg::~MobileMsg()
28{ 23{
29 // no need to delete child widgets, Qt does it all for us 24 // no need to delete child widgets, Qt does it all for us
30} 25}
31 26
32/* 27/*
33 * A simple slot... not very interesting. 28 * A simple slot... not very interesting.
34 */ 29 */
35void MobileMsg::goodBye() 30void MobileMsg::goodBye()
36{ 31{
37 close(); 32 close();
38} 33}
diff --git a/noncore/decorations/liquid/liquid.cpp b/noncore/decorations/liquid/liquid.cpp
index ef2ac3c..0bd4b1d 100644
--- a/noncore/decorations/liquid/liquid.cpp
+++ b/noncore/decorations/liquid/liquid.cpp
@@ -1,53 +1,51 @@
1#include "liquid.h" 1#include "liquid.h"
2 2
3#include <qapplication.h> 3#include <qapplication.h>
4#include <qpainter.h>
5#include <qpalette.h>
6#include <qdrawutil.h> 4#include <qdrawutil.h>
7 5
8 6
9LiquidDecoInterface::LiquidDecoInterface ( ) 7LiquidDecoInterface::LiquidDecoInterface ( )
10{ 8{
11} 9}
12 10
13LiquidDecoInterface::~LiquidDecoInterface ( ) 11LiquidDecoInterface::~LiquidDecoInterface ( )
14{ 12{
15} 13}
16 14
17 15
18 16
19QString LiquidDecoInterface::name ( ) const 17QString LiquidDecoInterface::name ( ) const
20{ 18{
21 return qApp-> translate ( "Decoration", "Liquid" ); 19 return qApp-> translate ( "Decoration", "Liquid" );
22} 20}
23 21
24 22
25QPixmap LiquidDecoInterface::icon ( ) const 23QPixmap LiquidDecoInterface::icon ( ) const
26{ 24{
27 return QPixmap ( ); 25 return QPixmap ( );
28} 26}
29 27
30void LiquidDecoInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) const 28void LiquidDecoInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) const
31{ 29{
32 QRect r = wd-> rect; 30 QRect r = wd-> rect;
33 int th = metric ( TitleHeight, wd ); 31 int th = metric ( TitleHeight, wd );
34 32
35 switch ( a ) { 33 switch ( a ) {
36 case WindowDecorationInterface::Border: { 34 case WindowDecorationInterface::Border: {
37 const QColorGroup &cg = wd-> palette. active ( ); 35 const QColorGroup &cg = wd-> palette. active ( );
38 qDrawWinPanel ( p, r. x ( ) - metric ( LeftBorder, wd ), 36 qDrawWinPanel ( p, r. x ( ) - metric ( LeftBorder, wd ),
39 r. y ( ) - th - metric ( TopBorder, wd ), 37 r. y ( ) - th - metric ( TopBorder, wd ),
40 r. width ( ) + metric ( LeftBorder, wd ) + metric ( RightBorder, wd ), 38 r. width ( ) + metric ( LeftBorder, wd ) + metric ( RightBorder, wd ),
41 r. height ( ) + th + metric ( TopBorder,wd) + metric ( BottomBorder, wd ), 39 r. height ( ) + th + metric ( TopBorder,wd) + metric ( BottomBorder, wd ),
42 cg, false, &cg. brush ( QColorGroup::Background )); 40 cg, false, &cg. brush ( QColorGroup::Background ));
43 break; 41 break;
44 } 42 }
45 case WindowDecorationInterface::Title: { 43 case WindowDecorationInterface::Title: {
46 const QColorGroup &cg = wd-> palette. active ( ); 44 const QColorGroup &cg = wd-> palette. active ( );
47 45
48 QBrush titleBrush; 46 QBrush titleBrush;
49 QPen titleLines1, titleLines2; 47 QPen titleLines1, titleLines2;
50 48
51 titleBrush = cg. brush (( wd-> flags & WindowData::Active ) ? QColorGroup::Highlight : QColorGroup::Background ); 49 titleBrush = cg. brush (( wd-> flags & WindowData::Active ) ? QColorGroup::Highlight : QColorGroup::Background );
52 titleLines1 = titleBrush. color ( ). dark ( 105 ); 50 titleLines1 = titleBrush. color ( ). dark ( 105 );
53 titleLines2 = titleBrush. color ( ). dark ( 103 ); 51 titleLines2 = titleBrush. color ( ). dark ( 103 );