KDE/kdelibs
Matt Rogers
mattr at kde.org
Wed Jun 27 02:12:52 BST 2007
On Tuesday 26 June 2007 17:24, Nickolai Shaforostoff wrote:
> SVN commit 680696 by shaforo:
>
> win some more bytes
Isn't this source incompatible and thus not allowed to be committed on a
Monday or is that only for bitfields?
Thanks,
--
Matt
>
> M +1 -1 kdecore/services/kplugininfo.cpp
> M +4 -4 kdeui/colors/kcolorbutton.cpp
> M +1 -1 kdeui/colors/kcolordialog.cpp
> M +9 -9 kdeui/findreplace/kfind.cpp
> M +2 -1 kdeui/fonts/kfontchooser.cpp
> M +7 -3 kdeui/plotting/kplotaxis.cpp
> M +5 -3 kdeui/widgets/kmenubar.cpp
> M +1 -1 kdeui/widgets/ktextedit.cpp
> M +2 -2 kdeui/widgets/ktoolbar.cpp
> M +2 -2 kdeui/widgets/kurllabel.cpp
> M +1 -1 kfile/kdiroperator.cpp
> M +1 -1 khtml/java/kjavaapplet.cpp
> M +3 -3 khtml/khtmlview.cpp
> M +8 -6 kio/bookmarks/kbookmarkmanager.cc
> M +1 -1 kio/kfile/kicondialog.cpp
> M +1 -1 kio/kfile/kopenwithdialog.cpp
> M +2 -2 kio/kio/tcpslavebase.cpp
>
>
> --- trunk/KDE/kdelibs/kdecore/services/kplugininfo.cpp #680695:680696
> @@ -56,10 +56,10 @@
> bool enabledbydefault;
> bool pluginenabled;
>
> + bool kcmservicesCached;
> KConfigGroup config;
> KService::Ptr service;
> QList<KService::Ptr> kcmservices;
> - bool kcmservicesCached;
> };
>
> KPluginInfo::KPluginInfo( const QString & filename, const char* resource )
> --- trunk/KDE/kdelibs/kdeui/colors/kcolorbutton.cpp #680695:680696
> @@ -40,13 +40,13 @@
> KColorButtonPrivate(KColorButton *q): q(q) {}
>
> KColorButton *q;
> + QColor m_defaultColor;
> bool m_bdefaultColor;
> - QColor m_defaultColor;
> -
> +
> + bool dragFlag;
> QColor col;
> QPoint mPos;
> - bool dragFlag;
> -
> +
> void initStyleOption(QStyleOptionButton* opt) const;
> };
>
> --- trunk/KDE/kdelibs/kdeui/colors/kcolordialog.cpp #680695:680696
> @@ -139,11 +139,11 @@
>
> KColorCells *q;
> QColor *colors;
> - bool inMouse;
> QPoint mousePos;
> int selected;
> bool shade;
> bool acceptDrags;
> + bool inMouse;
> };
>
> KColorCells::KColorCells( QWidget *parent, int rows, int cols )
> --- trunk/KDE/kdelibs/kdeui/findreplace/kfind.cpp #680695:680696
> @@ -61,13 +61,13 @@
>
> struct KFind::Private
> {
> - Private() :
> - findDialog(0),
> - patternChanged(false),
> - matchedPattern(""),
> - emptyMatch(0),
> - currentId(0),
> - customIds(false)
> + Private()
> + : findDialog(0)
> + , currentId(0)
> + , customIds(false)
> + , patternChanged(false)
> + , matchedPattern("")
> + , emptyMatch(0)
> {
> }
>
> @@ -110,13 +110,13 @@
> };
>
> QPointer<QWidget> findDialog;
> + int currentId;
> + bool customIds;
> bool patternChanged;
> QString matchedPattern;
> QHash<QString,Match> incrementalPath;
> Match * emptyMatch;
> QList<Data> data; // used like a vector, not like a
> linked-list - int currentId;
> - bool customIds;
> };
>
> ////
> --- trunk/KDE/kdelibs/kdeui/fonts/kfontchooser.cpp #680695:680696
> @@ -107,6 +107,8 @@
> QPalette m_palette;
> bool signalsAllowed;
>
> + bool usingFixed;
> +
> KIntNumInput *sizeOfFont;
>
> QLineEdit *sampleEdit;
> @@ -129,7 +131,6 @@
> int selectedSize;
> QMap<QString, QString> currentStyles;
>
> - bool usingFixed;
> };
>
>
> --- trunk/KDE/kdelibs/kdeui/plotting/kplotaxis.cpp #680695:680696
> @@ -27,8 +27,12 @@
> {
> public:
> Private( KPlotAxis *qq )
> - : q( qq ), m_visible( true ), m_showTickLabels( false ),
> - m_labelFieldWidth( 0 ), m_labelFmt( 'g' ), m_labelPrec( -1 )
> + : q( qq )
> + , m_visible( true )
> + , m_showTickLabels( false )
> + , m_labelFmt( 'g' )
> + , m_labelFieldWidth( 0 )
> + , m_labelPrec( -1 )
> {
> }
>
> @@ -36,9 +40,9 @@
>
> bool m_visible; // Property "visible" defines if Axis is drawn or
> not. bool m_showTickLabels;
> + char m_labelFmt; // Number format for number labels, see
> QString::arg() QString m_label; // The label of the axis.
> int m_labelFieldWidth; // Field width for number labels, see
> QString::arg() - char m_labelFmt; // Number format for number
> labels, see QString::arg() int m_labelPrec; // Number precision for number
> labels, see QString::arg() QList<double> m_MajorTickMarks,
> m_MinorTickMarks;
> };
> --- trunk/KDE/kdelibs/kdeui/widgets/kmenubar.cpp #680695:680696
> @@ -90,13 +90,15 @@
> delete selection;
> #endif
> }
> - bool forcedTopLevel;
> - bool topLevel;
> - bool wasTopLevel; // when TLW is fullscreen, remember state
> int frameStyle; // only valid in toplevel mode
> int lineWidth; // dtto
> int margin; // dtto
> bool fallback_mode; // dtto
> +
> + bool forcedTopLevel;
> + bool topLevel;
> + bool wasTopLevel; // when TLW is fullscreen, remember state
> +
> #ifdef Q_WS_X11
> KSelectionWatcher* selection;
> #endif
> --- trunk/KDE/kdelibs/kdeui/widgets/ktextedit.cpp #680695:680696
> @@ -66,10 +66,10 @@
> void menuActivated( QAction* action );
>
> KTextEdit *parent;
> - bool customPalette;
> QAction *autoSpellCheckAction;
> QAction *allowTab;
> QAction *spellCheckAction;
> + bool customPalette;
>
> bool checkSpellingEnabled;
> QString originalBuffer;
> --- trunk/KDE/kdelibs/kdeui/widgets/ktoolbar.cpp #680695:680696
> @@ -66,9 +66,9 @@
> unlockedMovable( true ),
> xmlguiClient( 0 ),
> contextLockAction( 0 ),
> - HiddenDefault( false ),
> IconSizeDefault( 22 ),
> ToolButtonStyleDefault( Qt::ToolButtonTextUnderIcon ),
> + HiddenDefault( false ),
> NewLineDefault( false ),
> OffsetDefault( 0 ),
> PositionDefault( "Top" ),
> @@ -151,9 +151,9 @@
> QMap<QAction*,int> contextIconSizes;
>
> // Default Values.
> - bool HiddenDefault;
> int IconSizeDefault;
> Qt::ToolButtonStyle ToolButtonStyleDefault;
> + bool HiddenDefault;
> bool NewLineDefault;
> int OffsetDefault;
> QString PositionDefault;
> --- trunk/KDE/kdelibs/kdeui/widgets/kurllabel.cpp #680695:680696
> @@ -70,12 +70,12 @@
> KUrlLabel *parent;
>
> QString url;
> - bool textUnderlined;
> - bool realUnderlined;
> QString tipText;
> QColor linkColor;
> QColor highlightedLinkColor;
> QCursor* cursor;
> + bool textUnderlined;
> + bool realUnderlined;
> bool useTips;
> bool useCursor;
> bool glowEnabled;
> --- trunk/KDE/kdelibs/kfile/kdiroperator.cpp #680695:680696
> @@ -91,8 +91,8 @@
> }
>
> bool dirHighlighting;
> + bool onlyDoubleClickSelectsFiles;
> QString lastURL; // used for highlighting a directory on cdUp
> - bool onlyDoubleClickSelectsFiles;
> QTimer *progressDelayTimer;
> QAction *viewActionSeparator;
> int dropOptions;
> --- trunk/KDE/kdelibs/khtml/java/kjavaapplet.cpp #680695:680696
> @@ -32,6 +32,7 @@
> {
> public:
> bool reallyExists;
> + bool failed;
> QString className;
> QString appName;
> QString baseURL;
> @@ -40,7 +41,6 @@
> QSize size;
> QString windowName;
> KJavaApplet::AppletState state;
> - bool failed;
>
> KJavaAppletWidget* UIwidget;
> };
> --- trunk/KDE/kdelibs/khtml/khtmlview.cpp #680695:680696
> @@ -335,13 +335,13 @@
> int borderX, borderY;
> KConfig *formCompletions;
>
> - bool paged;
> -
> int clickX, clickY, clickCount;
> bool isDoubleClick;
>
> + bool paged;
> +
> + bool scrollingSelf;
> int contentsX, contentsY;
> - bool scrollingSelf;
> int layoutTimerId;
> QKeyEvent* postponed_autorepeat;
>
> --- trunk/KDE/kdelibs/kio/bookmarks/kbookmarkmanager.cc #680695:680696
> @@ -92,20 +92,22 @@
> {
> public:
> Private(bool bDocIsloaded, const QString &dbusObjectName = QString())
> - : m_doc("xbel"),
> - m_docIsLoaded(bDocIsloaded),
> - m_dbusObjectName(dbusObjectName)
> + : m_doc("xbel")
> + , m_dbusObjectName(dbusObjectName)
> + , m_docIsLoaded(bDocIsloaded)
> +
> {}
>
> - QString m_bookmarksFile;
> mutable QDomDocument m_doc;
> mutable QDomDocument m_toolbarDoc;
> + QString m_bookmarksFile;
> + QString m_dbusObjectName;
> mutable bool m_docIsLoaded;
> bool m_update;
> - QString m_dbusObjectName;
>
> + bool m_browserEditor;
> QString m_editorCaption;
> - bool m_browserEditor;
> +
> };
>
> // ################
> --- trunk/KDE/kdelibs/kio/kfile/kicondialog.cpp #680695:680696
> @@ -674,8 +674,8 @@
>
> KIconButton *q;
>
> + int iconSize;
> bool m_bStrictIconSize;
> - int iconSize;
>
> bool mbUser;
> K3Icon::Group mGroup;
> --- trunk/KDE/kdelibs/kio/kfile/kopenwithdialog.cpp #680695:680696
> @@ -442,6 +442,7 @@
> void _k_slotOK();
>
> bool saveNewApps;
> + bool m_terminaldirty;
> KService::Ptr curService;
> KApplicationView *view;
> KUrlRequester *edit;
> @@ -449,7 +450,6 @@
> QLabel *label;
> QString qName;
> QString qMimeType;
> - bool m_terminaldirty;
> QCheckBox *terminal;
> QCheckBox *remember;
> QCheckBox *nocloseonexit;
> --- trunk/KDE/kdelibs/kio/kio/tcpslavebase.cpp #680695:680696
> @@ -89,18 +89,18 @@
> int status;
> int timeout;
> int rblockSz; // Size for reading blocks in readLine()
> + MetaData savedMetaData;
> bool block;
> bool useSSLTunneling;
> bool needSSLHandShake;
> bool militantSSL; // If true, we just drop a connection
> silently // if SSL certificate check fails in any way.
> bool userAborted;
> - MetaData savedMetaData;
>
> + bool isSSL;
> quint16 port;
> quint16 defaultPort;
> QByteArray serviceName;
> - bool isSSL;
> };
>
> QIODevice *TCPSlaveBase::socket() const
More information about the kde-core-devel
mailing list