fixed class members naming convention

svn path=/trunk/KDE/kdebase/workspace/; revision=1023570

clients/nitrogen/nitrogenclient.cpp

@@ -73,7 +73,7 @@ namespace Nitrogen
   NitrogenClient::NitrogenClient(KDecorationBridge *b, KDecorationFactory *f):
     KCommonDecorationUnstable(b, f),
     colorCacheInvalid_(true),
-    size_grip_( 0 ),
+    sizeGrip_( 0 ),
     inactiveShadowTiles_( 0 ),
     activeShadowTiles_( 0 ),
     helper_(*globalHelper),
@@ -809,7 +809,7 @@ namespace Nitrogen
     assert( !hasSizeGrip() );
     if( ( isResizable() && windowId() != 0 ) || isPreview() )
     {
-      size_grip_ = new NitrogenSizeGrip( this );
+      sizeGrip_ = new NitrogenSizeGrip( this );
       sizeGrip().setVisible( !( isMaximized() || isShade() ) );
     }
 
@@ -819,8 +819,8 @@ namespace Nitrogen
   void NitrogenClient::deleteSizeGrip( void )
   {
     assert( hasSizeGrip() );
-    size_grip_->deleteLater();
+    sizeGrip_->deleteLater();
-    size_grip_ = 0;
+    sizeGrip_ = 0;
   }
 
   //_________________________________________________________________

clients/nitrogen/nitrogenclient.h

@@ -171,11 +171,11 @@ namespace Nitrogen
 
         // size grip
         bool hasSizeGrip( void ) const
-        { return (bool)size_grip_; }
+        { return (bool)sizeGrip_; }
 
         //! size grip
         NitrogenSizeGrip& sizeGrip( void ) const
-        { return *size_grip_; }
+        { return *sizeGrip_; }
 
         //@}
 
@@ -189,7 +189,7 @@ namespace Nitrogen
         QColor cachedTitlebarTextColor_;
 
         //! size grip widget
-        NitrogenSizeGrip* size_grip_;
+        NitrogenSizeGrip* sizeGrip_;
 
         ShadowTilesOption inactiveShadowTilesOption_;
         ShadowTilesOption activeShadowTilesOption_;

clients/nitrogen/nitrogenexception.h

@@ -140,10 +140,10 @@ namespace Nitrogen
     //@{
 
     virtual QRegExp regExp( void ) const
-    { return reg_exp_; }
+    { return regExp_; }
 
     virtual QRegExp& regExp( void )
-    { return reg_exp_; }
+    { return regExp_; }
 
     //@}
 
@@ -168,7 +168,7 @@ namespace Nitrogen
     Type type_;
 
     //! regular expression to match window caption
-    QRegExp reg_exp_;
+    QRegExp regExp_;
 
     //! attributes mask
     unsigned int mask_;

clients/nitrogen/x11util.cpp

@@ -40,7 +40,7 @@ namespace Nitrogen
   //________________________________________________________________________
   X11Util::X11Util( void )
   {
-    _initializeAtomNames();
+    initializeAtomNames();
   }
 
   //________________________________________________________________________
@@ -49,8 +49,8 @@ namespace Nitrogen
 
     #ifdef Q_WS_X11
 
-    SupportedAtomMap::const_iterator iter( _supportedAtoms().find( atom ) );
+    SupportedAtomMap::const_iterator iter( supportedAtoms().find( atom ) );
-    if( iter != _supportedAtoms().end() ) return iter->second;
+    if( iter != supportedAtoms().end() ) return iter->second;
 
     Display* display( QX11Info::display() );
     Atom net_supported( findAtom( _NET_SUPPORTED ) );
@@ -77,7 +77,7 @@ namespace Nitrogen
 
       if( found == searched )
       {
-        supported_atoms_[atom] = true;
+        supportedAtoms_[atom] = true;
         return true;
       }
 
@@ -86,7 +86,7 @@ namespace Nitrogen
 
     }
 
-    supported_atoms_[atom] = false;
+    supportedAtoms_[atom] = false;
 
     #endif
 
@@ -135,12 +135,12 @@ namespace Nitrogen
   }
 
   //________________________________________________________________________
-  void X11Util::_initializeAtomNames( void )
+  void X11Util::initializeAtomNames( void )
   {
 
-    atom_names_[_NET_SUPPORTED] = "_NET_SUPPORTED";
+    atomNames_[_NET_SUPPORTED] = "_NET_SUPPORTED";
-    atom_names_[_NET_WM_STATE] = "_NET_WM_STATE";
+    atomNames_[_NET_WM_STATE] = "_NET_WM_STATE";
-    atom_names_[_NET_WM_MOVERESIZE] = "_NET_WM_MOVERESIZE";
+    atomNames_[_NET_WM_MOVERESIZE] = "_NET_WM_MOVERESIZE";
 
     return;
   }
@@ -152,12 +152,12 @@ namespace Nitrogen
   {
 
     // find atom in map
-    AtomMap::iterator iter( _atoms().find( atom ) );
+    AtomMap::iterator iter( atoms().find( atom ) );
-    if( iter != _atoms().end() ) return iter->second;
+    if( iter != atoms().end() ) return iter->second;
 
     // create atom if not found
     Display* display( QX11Info::display() );
-    Atom out( XInternAtom(display, qPrintable( atom_names_[atom] ), false ) );
+    Atom out( XInternAtom(display, qPrintable( atomNames_[atom] ), false ) );
     atoms_[atom] = out;
     return out;
 

clients/nitrogen/x11util.h

@@ -92,22 +92,22 @@ namespace Nitrogen
     typedef std::map<Atoms, QString> AtomNameMap;
 
     //! atom names
-    void _initializeAtomNames( void );
+    void initializeAtomNames( void );
 
     //! atom names
-    const AtomNameMap& _atomNames( void ) const
+    const AtomNameMap& atomNames( void ) const
-    { return atom_names_; }
+    { return atomNames_; }
 
-    AtomNameMap atom_names_;
+    AtomNameMap atomNames_;
 
     //! supported atoms
     typedef std::map<Atoms, bool > SupportedAtomMap;
 
     //! supported atoms
-    const SupportedAtomMap& _supportedAtoms( void ) const
+    const SupportedAtomMap& supportedAtoms( void ) const
-    { return supported_atoms_; }
+    { return supportedAtoms_; }
 
-    SupportedAtomMap supported_atoms_;
+    SupportedAtomMap supportedAtoms_;
 
     #ifdef Q_WS_X11
 
@@ -115,8 +115,8 @@ namespace Nitrogen
     typedef std::map<Atoms, Atom> AtomMap;
 
     //! atoms
-    // const AtomMap& _atoms( void ) const
+    // const AtomMap& atoms( void ) const
-    AtomMap& _atoms( void )
+    AtomMap& atoms( void )
     { return atoms_; }
 
     //! atoms