From d27b30a66ae9038eadf81cc06dae1b002bef7625 Mon Sep 17 00:00:00 2001 From: Zack Rusin Date: Mon, 4 Dec 2006 19:51:53 +0000 Subject: [PATCH] fixing more warnings svn path=/trunk/playground/utils/dolphin/; revision=610636 --- src/bookmarkssidebarpage.cpp | 2 +- src/dolphincontextmenu.cpp | 4 ++-- src/dolphinmainwindow.cpp | 7 ++++--- src/iconsviewsettingspage.cpp | 28 ++++++++++++++-------------- src/infosidebarpage.cpp | 11 ++++++----- src/protocolcombo.cpp | 2 +- 6 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp index 7eced5a01..295498bb7 100644 --- a/src/bookmarkssidebarpage.cpp +++ b/src/bookmarkssidebarpage.cpp @@ -44,7 +44,7 @@ BookmarksSidebarPage::BookmarksSidebarPage(DolphinMainWindow* mainWindow, QWidge { Q3VBoxLayout* layout = new Q3VBoxLayout(this); m_bookmarksList = new BookmarksListBox(this); - m_bookmarksList->setPaletteBackgroundColor(colorGroup().background()); + m_bookmarksList->setPaletteBackgroundColor(palette().brush(QPalette::Background).color()); layout->addWidget(m_bookmarksList); connect(m_bookmarksList, SIGNAL(mouseButtonClicked(int, Q3ListBoxItem*, const QPoint&)), diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 53bc09558..74c216017 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -379,11 +379,11 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, while (insert && mimeIt.hasNext()) { KFileItem* item = mimeIt.next(); const QString mimeType(item->mimetype()); - const QString mimeGroup(mimeType.left(mimeType.find('/'))); + const QString mimeGroup(mimeType.left(mimeType.indexOf('/'))); insert = (*it == mimeType) || ((*it).right(1) == "*") && - ((*it).left((*it).find('/')) == mimeGroup); + ((*it).left((*it).indexOf('/')) == mimeGroup); } } diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index c1a68fad5..08773fac1 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -77,11 +77,12 @@ DolphinMainWindow::DolphinMainWindow() : - KMainWindow(0, "Dolphin"), + KMainWindow(0), m_splitter(0), m_activeView(0), m_clipboardContainsCutData(false) { + setObjectName("Dolphin"); m_view[PrimaryIdx] = 0; m_view[SecondaryIdx] = 0; @@ -458,7 +459,7 @@ void DolphinMainWindow::createFile() KSortableList::ConstIterator it = m_createFileTemplates.begin(); KSortableList::ConstIterator end = m_createFileTemplates.end(); - const QString senderName(sender()->name()); + const QString senderName(sender()->objectName()); bool found = false; CreateFileEntry entry; while (!found && (it != end)) { @@ -483,7 +484,7 @@ void DolphinMainWindow::createFile() QString sourcePath(entry.templatePath.left(pos + 1)); sourcePath += KDesktopFile(entry.templatePath, true).readPathEntry("Url"); - QString name(i18n(entry.name.ascii())); + QString name(i18n(entry.name.toAscii())); // Most entry names end with "..." (e. g. "HTML File..."), which is ok for // menus but no good choice for a new file name -> remove the dots... name.replace("...", QString::null); diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index 69d700e57..0458de467 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -131,9 +131,9 @@ IconsViewSettingsPage::IconsViewSettingsPage(/*DolphinIconsView::LayoutMode mode new QLabel(i18n("Text width:"), textGroup); m_textWidthBox = new QComboBox(textGroup); - m_textWidthBox->insertItem(i18n("Small")); - m_textWidthBox->insertItem(i18n("Medium")); - m_textWidthBox->insertItem(i18n("Large")); + m_textWidthBox->addItem(i18n("Small")); + m_textWidthBox->addItem(i18n("Medium")); + m_textWidthBox->addItem(i18n("Large")); Q3GroupBox* gridGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Grid"), this); gridGroup->setSizePolicy(sizePolicy); @@ -142,16 +142,16 @@ IconsViewSettingsPage::IconsViewSettingsPage(/*DolphinIconsView::LayoutMode mode const bool leftToRightArrangement = (settings->arrangement() == "LeftToRight"); new QLabel(i18n("Arrangement:"), gridGroup); m_arrangementBox = new QComboBox(gridGroup); - m_arrangementBox->insertItem(i18n("Left to right")); - m_arrangementBox->insertItem(i18n("Top to bottom")); - m_arrangementBox->setCurrentItem(leftToRightArrangement ? 0 : 1); + m_arrangementBox->addItem(i18n("Left to right")); + m_arrangementBox->addItem(i18n("Top to bottom")); + m_arrangementBox->setCurrentIndex(leftToRightArrangement ? 0 : 1); new QLabel(i18n("Grid spacing:"), gridGroup); m_gridSpacingBox = new QComboBox(gridGroup); - m_gridSpacingBox->insertItem(i18n("Small")); - m_gridSpacingBox->insertItem(i18n("Medium")); - m_gridSpacingBox->insertItem(i18n("Large")); - m_gridSpacingBox->setCurrentItem((settings->gridSpacing() - GRID_SPACING_BASE) / GRID_SPACING_INC); + m_gridSpacingBox->addItem(i18n("Small")); + m_gridSpacingBox->addItem(i18n("Medium")); + m_gridSpacingBox->addItem(i18n("Large")); + m_gridSpacingBox->setCurrentIndex((settings->gridSpacing() - GRID_SPACING_BASE) / GRID_SPACING_INC); // Add a dummy widget with no restriction regarding // a vertical resizing. This assures that the dialog layout @@ -184,18 +184,18 @@ void IconsViewSettingsPage::applySettings() const int fontSize = m_fontSizeBox->value(); - QString arrangement = (m_arrangementBox->currentItem() == 0) ? + QString arrangement = (m_arrangementBox->currentIndex() == 0) ? "LeftToRight" : "TopToBottom"; settings->setArrangement(arrangement); - DolphinSettings::instance().calculateGridSize(m_textWidthBox->currentItem()); + DolphinSettings::instance().calculateGridSize(m_textWidthBox->currentIndex()); settings->setFontFamily(m_fontFamilyBox->currentFont().family()); settings->setFontSize(fontSize); settings->setNumberOfTexlines(m_textlinesCountBox->value()); settings->setGridSpacing(GRID_SPACING_BASE + - m_gridSpacingBox->currentItem() * GRID_SPACING_INC); + m_gridSpacingBox->currentIndex() * GRID_SPACING_INC); } void IconsViewSettingsPage::slotIconSizeChanged(int value) @@ -257,7 +257,7 @@ void IconsViewSettingsPage::adjustTextWidthSelection() { IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); assert(settings != 0); - m_textWidthBox->setCurrentItem(DolphinSettings::instance().textWidthHint()); + m_textWidthBox->setCurrentIndex(DolphinSettings::instance().textWidthHint()); } #include "iconsviewsettingspage.moc" diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index e584bfa8d..b32f83cd1 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -132,7 +132,8 @@ void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url) if (!url.isEmpty() && !m_multipleSelection) { m_urlCandidate = url; - m_timer->start(300, true); + m_timer->setSingleShot(true); + m_timer->start(300); } } @@ -473,11 +474,11 @@ void InfoSidebarPage::insertActions() while (insert && mimeIt.hasNext()) { KFileItem* item = mimeIt.next(); const QString mimeType(item->mimetype()); - const QString mimeGroup(mimeType.left(mimeType.find('/'))); + const QString mimeGroup(mimeType.left(mimeType.indexOf('/'))); insert = (*it == mimeType) || ((*it).right(1) == "*") && - ((*it).left((*it).find('/')) == mimeGroup); + ((*it).left((*it).indexOf('/')) == mimeGroup); } } @@ -536,7 +537,7 @@ ServiceButton::ServiceButton(const QIcon& icon, m_hover(false), m_index(index) { - setEraseColor(colorGroup().background()); + setEraseColor(palette().brush(QPalette::Background).color()); setFocusPolicy(Qt::NoFocus); connect(this, SIGNAL(released()), this, SLOT(slotReleased())); @@ -559,7 +560,7 @@ void ServiceButton::paintEvent(QPaintEvent* event) foregroundColor = KGlobalSettings::highlightedTextColor(); } else { - backgroundColor = colorGroup().background(); + backgroundColor = palette().brush(QPalette::Background).color(); foregroundColor = KGlobalSettings::buttonTextColor(); } diff --git a/src/protocolcombo.cpp b/src/protocolcombo.cpp index b40a73b5b..3bc818706 100644 --- a/src/protocolcombo.cpp +++ b/src/protocolcombo.cpp @@ -48,7 +48,7 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, UrlNavigator* parent) //kDebug() << "!!! removing " << *it << endl; QStringList::iterator tempIt = it; ++tempIt; - m_protocols.remove(it); + m_protocols.erase(it); it = tempIt; } else -- 2.47.3