[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/network/konversation/src
From:       John Tapsell <john.tapsell () kdemail ! net>
Date:       2005-09-01 1:03:03
Message-ID: 1125536583.710084.23994.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 455621 by johnflux:

Rename oSD to OSD :) 


 M  +10 -10    konversationapplication.cpp  
 M  +16 -16    preferences.cpp  
 M  +2 -2      preferences.h  


--- trunk/extragear/network/konversation/src/konversationapplication.cpp \
#455620:455621 @@ -517,15 +517,15 @@
  *
  *     if(osd)
     {
-        osd->setEnabled(Preferences::oSDUsage());
-        osd->setFont(Preferences::oSDFont());
-        osd->setDuration(Preferences::oSDDuration());
-        osd->setScreen(Preferences::oSDScreen());
-        osd->setShadow(Preferences::oSDDrawShadow());
-        osd->setOffset(Preferences::oSDOffsetX(),preferences.getOSDOffsetY());
-        osd->setAlignment((OSDWidget::Alignment)Preferences::oSDAlignment());
+        osd->setEnabled(Preferences::OSDUsage());
+        osd->setFont(Preferences::OSDFont());
+        osd->setDuration(Preferences::OSDDuration());
+        osd->setScreen(Preferences::OSDScreen());
+        osd->setShadow(Preferences::OSDDrawShadow());
+        osd->setOffset(Preferences::OSDOffsetX(),preferences.getOSDOffsetY());
+        osd->setAlignment((OSDWidget::Alignment)Preferences::OSDAlignment());
 
-        if(Preferences::oSDUseCustomColors())
+        if(Preferences::OSDUseCustomColors())
         {
             QString osdTextColor = config->readEntry("OSDTextColor");
             if(osdTextColor.isEmpty())
@@ -533,7 +533,7 @@
             else
                 Preferences::setOSDTextColor("#" + osdTextColor);
 
-            osd->setTextColor(Preferences::oSDTextColor());
+            osd->setTextColor(Preferences::OSDTextColor());
 
             QString osdBackgroundColor = config->readEntry("OSDBackgroundColor");
             if(osdBackgroundColor.isEmpty())
@@ -541,7 +541,7 @@
             else
                 Preferences::setOSDBackgroundColor("#" + osdBackgroundColor);
 
-            osd->setBackgroundColor(Preferences::oSDBackgroundColor());
+            osd->setBackgroundColor(Preferences::OSDBackgroundColor());
         }
     }
 */
--- trunk/extragear/network/konversation/src/preferences.cpp #455620:455621
@@ -677,53 +677,53 @@
 
 // On Screen Display
 void Preferences::setOSDUsage(bool state) { OSDUsage=state; }
-const bool Preferences::oSDUsage() { return OSDUsage; }
+const bool Preferences::OSDUsage() { return OSDUsage; }
 
 void Preferences::setOSDShowOwnNick(bool state) { OSDShowOwnNick=state; }
-const bool Preferences::oSDShowOwnNick() { return OSDShowOwnNick; }
+const bool Preferences::OSDShowOwnNick() { return OSDShowOwnNick; }
 
 void Preferences::setOSDShowChannel(bool state) { OSDShowChannel=state; }
-const bool Preferences::oSDShowChannel() { return OSDShowChannel; }
+const bool Preferences::OSDShowChannel() { return OSDShowChannel; }
 
 void Preferences::setOSDShowQuery(bool state) { OSDShowQuery=state; }
-const bool Preferences::oSDShowQuery() { return OSDShowQuery; }
+const bool Preferences::OSDShowQuery() { return OSDShowQuery; }
 
 void Preferences::setOSDShowChannelEvent(bool state) { OSDShowChannelEvent=state; }
-const bool Preferences::oSDShowChannelEvent() { return OSDShowChannelEvent; }
+const bool Preferences::OSDShowChannelEvent() { return OSDShowChannelEvent; }
 
-const QFont Preferences::oSDFont() { return osdFont; }
+const QFont Preferences::OSDFont() { return osdFont; }
 void Preferences::setOSDFont(const QFont &newFont) { osdFont=newFont; }
 void Preferences::setOSDFontRaw(const QString &rawFont) { \
osdFont.fromString(rawFont); }  
 /*void Preferences::setOSDColor(const QString &newColor) { \
                osdColor.setNamedColor(newColor); }
-QColor Preferences::oSDColor() { return osdColor; }*/
+QColor Preferences::OSDColor() { return osdColor; }*/
 
 void Preferences::setOSDUseCustomColors(bool state) { useOSDCustomColors = state; }
-const bool Preferences::oSDUseCustomColors() { return useOSDCustomColors; }
+const bool Preferences::OSDUseCustomColors() { return useOSDCustomColors; }
 
 void Preferences::setOSDTextColor(const QString& newColor) { \
                osdTextColor.setNamedColor(newColor); }
-const QColor Preferences::oSDTextColor() { return osdTextColor; }
+const QColor Preferences::OSDTextColor() { return osdTextColor; }
 
 void Preferences::setOSDBackgroundColor(const QString& newColor) { \
                osdBackgroundColor.setNamedColor(newColor); }
-const QColor Preferences::oSDBackgroundColor() { return osdBackgroundColor; }
+const QColor Preferences::OSDBackgroundColor() { return osdBackgroundColor; }
 
 void Preferences::setOSDDuration(int ms) { OSDDuration = ms; }
-const int Preferences::oSDDuration() { return OSDDuration; }
+const int Preferences::OSDDuration() { return OSDDuration; }
 
 void Preferences::setOSDScreen(uint screen) { OSDScreen = screen; }
-const uint Preferences::oSDScreen() { return OSDScreen; }
+const uint Preferences::OSDScreen() { return OSDScreen; }
 
 void Preferences::setOSDDrawShadow(bool state) { OSDDrawShadow = state; }
-const bool Preferences::oSDDrawShadow() { return OSDDrawShadow; }
+const bool Preferences::OSDDrawShadow() { return OSDDrawShadow; }
 
 void Preferences::setOSDOffsetX(int offset) { OSDOffsetX = offset; }
-const int Preferences::oSDOffsetX() { return OSDOffsetX; }
+const int Preferences::OSDOffsetX() { return OSDOffsetX; }
 
 void Preferences::setOSDOffsetY(int offset) { OSDOffsetY = offset; }
-const int Preferences::oSDOffsetY() { return OSDOffsetY; }
+const int Preferences::OSDOffsetY() { return OSDOffsetY; }
 
 void Preferences::setOSDAlignment(int alignment) { OSDAlignment = alignment; }
-const int Preferences::oSDAlignment() { return OSDAlignment; }
+const int Preferences::OSDAlignment() { return OSDAlignment; }
 
 const QFont Preferences::textFont() { return textFont; }
 const QFont Preferences::listFont() { return listFont; }
--- trunk/extragear/network/konversation/src/preferences.h #455620:455621
@@ -473,12 +473,12 @@
 
         static const bool openWatchedNicksAtStartup();
         static void setOpenWatchedNicksAtStartup(bool open);
-
+*/
         static const QString channelEncoding(const QString& server,const QString& \
                channel);
         static void setChannelEncoding(const QString& server,const QString& \
channel,const QString& encoding);  static const QStringList \
                channelEncodingsServerList();
         static const QStringList channelEncodingsChannelList(const QString& server);
-
+/*
         // Themes
         static void setIconTheme(const QString& name);
         static const QString iconTheme();


[prev in list] [next in list] [prev in thread] [next in thread]