[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/apps
From: Rick Xing <jianxing () redflag-linux ! com>
Date: 2008-12-09 6:59:34
Message-ID: 1228805974.833357.9863.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 894687 by rickxing:
Just EBN fixes
M +3 -3 dolphin/src/commenteditwidget.cpp
M +1 -1 dolphin/src/tagcloud/tagcloud.cpp
M +6 -6 kdialog/kdialog.cpp
M +2 -2 konsole/src/EditProfileDialog.cpp
M +4 -4 konsole/src/TerminalDisplay.cpp
M +8 -8 konsole/src/Vt102Emulation.cpp
M +2 -4 konsole/src/ZModemDialog.cpp
M +2 -2 konsole/src/ZModemDialog.h
M +1 -1 lib/konq/konq_menuactions.cpp
M +3 -3 nsplugins/pluginscan.cpp
M +2 -2 nsplugins/viewer/nsplugin.cpp
--- trunk/KDE/kdebase/apps/dolphin/src/commenteditwidget.cpp #894686:894687
@@ -19,7 +19,6 @@
#include "commenteditwidget.h"
-#include <QtGui/QTextEdit>
#include <QtGui/QToolButton>
#include <QtGui/QVBoxLayout>
#include <QtCore/QEventLoop>
@@ -33,6 +32,7 @@
#include <KDialog>
#include <KLocale>
#include <KDebug>
+#include <KTextEdit>
class CommentEditWidget::Private
@@ -45,7 +45,7 @@
QEventLoop* eventLoop;
bool success;
- QTextEdit* textEdit;
+ KTextEdit* textEdit;
QToolButton* buttonSave;
QToolButton* buttonCancel;
@@ -112,7 +112,7 @@
setFrameStyle( QFrame::Box|QFrame::Plain );
setWindowFlags( Qt::Popup );
- d->textEdit = new QTextEdit( this );
+ d->textEdit = new KTextEdit( this );
d->textEdit->installEventFilter( this );
QVBoxLayout* layout = new QVBoxLayout( this );
layout->setMargin( 0 );
--- trunk/KDE/kdebase/apps/dolphin/src/tagcloud/tagcloud.cpp #894686:894687
@@ -145,7 +145,7 @@
// The resource whose tags we are showing
// invalid if we show all tags or a selection
- QUrl resource;
+ KUrl resource;
bool showAllTags;
// the actual nodes
--- trunk/KDE/kdebase/apps/kdialog/kdialog.cpp #894686:894687
@@ -41,9 +41,9 @@
#include <netwm.h>
#endif
-#ifdef Q_WS_WIN
-#include <QtGui/QFileDialog>
-#endif
+// #ifdef Q_WS_WIN
+// #include <QtGui/QFileDialog>
+// #endif
#include <unistd.h>
using namespace std;
@@ -487,9 +487,9 @@
startDir = args->getOption("getexistingdirectory");
QString result;
#ifdef Q_WS_WIN
- result = QFileDialog::getExistingDirectory( 0, title, startDir,
- QFileDialog::DontResolveSymlinks |
- QFileDialog::ShowDirsOnly);
+ result = KFileDialog::getExistingDirectory( 0, title, startDir,
+ KFileDialog::DontResolveSymlinks |
+ KFileDialog::ShowDirsOnly);
#else
KUrl url;
KDirSelectDialog myDialog( startDir, true, 0 );
--- trunk/KDE/kdebase/apps/konsole/src/EditProfileDialog.cpp #894686:894687
@@ -26,7 +26,6 @@
#include <QtGui/QPainter>
#include <QtGui/QStandardItem>
#include <QtCore/QTextCodec>
-#include <QtGui/QTextEdit>
#include <QtGui/QLinearGradient>
#include <QtGui/QRadialGradient>
@@ -42,6 +41,7 @@
#include <KFileDialog>
#include <KUrlCompletion>
#include <KWindowSystem>
+#include <KTextEdit>
// Konsole
#include "ColorScheme.h"
@@ -279,7 +279,7 @@
const Profile::Ptr info = lookupProfile();
KDialog* dialog = new KDialog(this);
- QTextEdit* edit = new QTextEdit(dialog);
+ KTextEdit* edit = new KTextEdit(dialog);
QStringList currentEnvironment = \
info->property<QStringList>(Profile::Environment);
--- trunk/KDE/kdebase/apps/konsole/src/TerminalDisplay.cpp #894686:894687
@@ -954,7 +954,7 @@
// which therefore need to be repainted
int dirtyLineCount = 0;
- for (y = 0; y < linesToUpdate; y++)
+ for (y = 0; y < linesToUpdate; ++y)
{
const Character* currentLine = &_image[y*this->_columns];
const Character* const newLine = &newimg[y*columns];
@@ -966,7 +966,7 @@
// its cell boundaries
memset(dirtyMask, 0, columnsToUpdate+2);
- for( x = 0 ; x < columnsToUpdate ; x++)
+ for( x = 0 ; x < columnsToUpdate ; ++x)
{
if ( newLine[x] != currentLine[x] )
{
@@ -975,7 +975,7 @@
}
if (!_resizing) // not while _resizing, we're expecting a paintEvent
- for (x = 0; x < columnsToUpdate; x++)
+ for (x = 0; x < columnsToUpdate; ++x)
{
_hasBlinker |= (newLine[x].rendition & RE_BLINK);
@@ -995,7 +995,7 @@
_clipboard = newLine[x].backgroundColor;
if (newLine[x].foregroundColor != cf) cf = newLine[x].foregroundColor;
int lln = columnsToUpdate - x;
- for (len = 1; len < lln; len++)
+ for (len = 1; len < lln; ++len)
{
const Character& ch = newLine[x+len];
--- trunk/KDE/kdebase/apps/konsole/src/Vt102Emulation.cpp #894686:894687
@@ -220,22 +220,22 @@
{
int i;
quint8* s;
- for(i = 0;i < 256; i++)
+ for(i = 0;i < 256; ++i)
charClass[i] = 0;
- for(i = 0;i < 32; i++)
+ for(i = 0;i < 32; ++i)
charClass[i] |= CTL;
- for(i = 32;i < 256; i++)
+ for(i = 32;i < 256; ++i)
charClass[i] |= CHR;
- for(s = (quint8*)"@ABCDGHILMPSTXZcdfry"; *s; s++)
+ for(s = (quint8*)"@ABCDGHILMPSTXZcdfry"; *s; ++s)
charClass[*s] |= CPN;
// resize = \e[8;<row>;<col>t
- for(s = (quint8*)"t"; *s; s++)
+ for(s = (quint8*)"t"; *s; ++s)
charClass[*s] |= CPS;
- for(s = (quint8*)"0123456789"; *s; s++)
+ for(s = (quint8*)"0123456789"; *s; ++s)
charClass[*s] |= DIG;
- for(s = (quint8*)"()+*%"; *s; s++)
+ for(s = (quint8*)"()+*%"; *s; ++s)
charClass[*s] |= SCS;
- for(s = (quint8*)"()+*#[]%"; *s; s++)
+ for(s = (quint8*)"()+*#[]%"; *s; ++s)
charClass[*s] |= GRP;
resetTokenizer();
--- trunk/KDE/kdebase/apps/konsole/src/ZModemDialog.cpp #894686:894687
@@ -19,11 +19,9 @@
// Own
#include "ZModemDialog.h"
-// Qt
-#include <QtGui/QTextEdit>
-
// KDE
#include <KLocale>
+#include <KTextEdit>
using namespace Konsole;
@@ -41,7 +39,7 @@
showButtonSeparator( true );
enableButton(Close, false);
- _textEdit = new QTextEdit(this);
+ _textEdit = new KTextEdit(this);
_textEdit->setMinimumSize(400, 100);
_textEdit->setReadOnly(true);
setMainWidget(_textEdit);
--- trunk/KDE/kdebase/apps/konsole/src/ZModemDialog.h #894686:894687
@@ -21,7 +21,7 @@
#include <kdialog.h>
-class QTextEdit;
+class KTextEdit;
namespace Konsole
{
@@ -46,7 +46,7 @@
void slotClose();
private:
- QTextEdit* _textEdit;
+ KTextEdit* _textEdit;
};
}
--- trunk/KDE/kdebase/apps/lib/konq/konq_menuactions.cpp #894686:894687
@@ -235,7 +235,7 @@
const KMimeType::Ptr mimeTypePtr = commonMimeType.isEmpty() ? KMimeType::Ptr() : \
KMimeType::mimeType(commonMimeType);
const KService::List entries = KServiceTypeTrader::self()->query( \
"KonqPopupMenu/Plugin"); KService::List::const_iterator eEnd = entries.end();
- for (KService::List::const_iterator it2 = entries.begin(); it2 != eEnd; it2++ ) \
{ + for (KService::List::const_iterator it2 = entries.begin(); it2 != eEnd; ++it2 \
) {
QString file = KStandardDirs::locate("services", (*it2)->entryPath());
KDesktopFile desktopFile( file );
const KConfigGroup cfg = desktopFile.desktopGroup();
--- trunk/KDE/kdebase/apps/nsplugins/pluginscan.cpp #894686:894687
@@ -184,7 +184,7 @@
mimeTypeWriter.setIconName("x-kde-nsplugin-generated");
if (!extensions.isEmpty()) {
- const QStringList exts = extensions.split(",");
+ const QStringList exts = extensions.split(',');
QStringList patterns;
for (QStringList::const_iterator it=exts.constBegin(); it != \
exts.constEnd(); ++it) patterns.append( "*." + (*it).trimmed() );
@@ -483,7 +483,7 @@
void removeExistingExtensions( QString &extension )
{
QStringList filtered;
- const QStringList exts = extension.split( "," );
+ const QStringList exts = extension.split( ',' );
for ( QStringList::const_iterator it=exts.constBegin(); it!=exts.constEnd(); \
++it ) { QString ext = (*it).trimmed();
if ( ext == "*" ) // some plugins have that, but we don't want to associate \
a mimetype with *.*! @@ -614,7 +614,7 @@
kDebug(1433) << "Handling MIME type " << *it;
- QStringList info = (*it).split(":", QString::KeepEmptyParts);
+ QStringList info = (*it).split(':', QString::KeepEmptyParts);
if ( info.count()==4 ) {
QString pluginName = info[0];
QString type = info[1].toLower();
--- trunk/KDE/kdebase/apps/nsplugins/viewer/nsplugin.cpp #894686:894687
@@ -333,7 +333,7 @@
uint32 l;
bool previousCR = true;
- for (l = 1;; l++) {
+ for (l = 1;; ++l) {
if (l == len) {
break;
}
@@ -431,7 +431,7 @@
uint32 l;
bool previousCR = true;
- for (l = 1;; l++) {
+ for (l = 1;; ++l) {
if (l == len) {
break;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic