Changeset 6078

Timestamp:

03/02/08 23:12:42 (9 months ago)

Author:

flynd

Message:

Removed some compile warnings about hidden virtual functions and unused function.

Location:

trunk/qt4-gui/src

Files:

• config/skin.h (modified) (2 diffs)
• contactlist/sortedcontactlistproxy.h (modified) (1 diff)
• widgets/mledit.cpp (modified) (2 diffs)

trunk/qt4-gui/src/config/skin.h

@@ -84 +84 @@
   virtual ~ButtonSkin() { }
   virtual void loadSkin(CIniFile& skinFile, QString name, QString baseSkinDir);
+
+private:
+  using ShapeSkin::loadSkin;
 };
 
@@ -96 +99 @@
   virtual ~LabelSkin() { }
   virtual void loadSkin(CIniFile& skinFile, QString name, QString baseSkinDir);
+
+private:
+  using ShapeSkin::loadSkin;
 };
 

trunk/qt4-gui/src/contactlist/sortedcontactlistproxy.h

@@ -64 +64 @@
   void sort(int column = 0, int role = Qt::DisplayRole, Qt::SortOrder order = Qt::AscendingOrder);
 
+  /**
+   * Same sort as above but with same parameters as base class so we overload
+   * it. Also this sort() has no default values to sovle problems when calls
+   * to sort() would be ambiguous with base sort() accessable.
+   *
+   * @param column Column to sort on
+   * @param order Order to sort
+   */
+  virtual void sort(int column, Qt::SortOrder order)
+  { sort(column, Qt::DisplayRole, order); }
+
 private:
   /**

trunk/qt4-gui/src/widgets/mledit.cpp

@@ -260 +260 @@
 }
 
+#if 0
+//TODO: This may or may not be needed for KTextEdit in KDE 4
+
 #ifdef MLEDIT_USE_KTEXTEDIT
 /**
@@ -277 +280 @@
 #endif
 
-#if 0
-//TODO: This may or may not be needed for KTextEdit in KDE 4
 /*
  * KTextEdit adds a menu entry for doing spell checking. Unfortunatly KSpell