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

List:       kde-commits
Subject:    kdenetwork/kopete/kopete
From:       Will Stephenson <lists () stevello ! free-online ! co ! uk>
Date:       2005-03-07 18:51:58
Message-ID: 20050307185158.7B9D6103CB () office ! kde ! org
[Download RAW message or body]

CVS commit by wstephens: 

Remove outdated compatibility code


  M +0 -5      kopeteballoon.cpp   1.26
  M +0 -2      addcontactwizard/addcontactwizard.cpp   1.55
  M +0 -9      chatwindow/kopetechatwindow.cpp   1.102
  M +0 -2      chatwindow/krichtexteditpart.cpp   1.24


--- kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp  #1.23:1.24
@@ -120,7 +120,5 @@ void KopeteRichTextEditPart::createActio
         enableRichText = new KToggleAction(i18n("Enable &Rich Text"), "pencil", 0,
                                 ac, "enableRichText" );
-#if KDE_IS_VERSION(3,2,90)
         enableRichText->setCheckedState(i18n("Disable &Rich Text"));
-#endif
         connect( enableRichText, SIGNAL( toggled(bool) ),
                         this, SLOT( slotSetRichTextEnabled(bool) ) );

--- kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.cpp  #1.101:1.102
@@ -372,7 +372,5 @@ void KopeteChatWindow::initActions(void)
         toggleMembers = new KToggleAction( i18n( "Show" ), QString::null, 0,
                 this, SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" );
-#if KDE_IS_VERSION(3,2,90)
         toggleMembers->setCheckedState(i18n("Hide"));
-#endif
 
         actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" );
@@ -385,10 +383,5 @@ void KopeteChatWindow::initActions(void)
 
         // add configure key bindings menu item
-#if KDE_IS_VERSION(3, 2, 90)
         KStdAction::keyBindings( guiFactory(), SLOT( configureShortcuts() ), coll );
-#else  // when we will drop the KDE 3.2 compatibility, do not forget to remove  slotConfKeys
-        KStdAction::keyBindings( this, SLOT( slotConfKeys() ), coll );
-        #endif
-
 
         KStdAction::configureToolbars(this, SLOT(slotConfToolbar()), coll);
@@ -420,7 +413,5 @@ void KopeteChatWindow::initActions(void)
         createGUI( 0L );
 
-#if !KDE_IS_VERSION( 3, 1, 90 )
         mStatusbarAction->setChecked(!statusBar()->isHidden());
-#endif
 }
 

--- kdenetwork/kopete/kopete/addcontactwizard/addcontactwizard.cpp  #1.54:1.55
@@ -166,7 +166,5 @@ void AddContactWizard::slotAddAddresseeC
                         {
                                 kdError() << "Saving failed!" << endl;
-#if KDE_IS_VERSION (3,1,90)
                                 m_addressBook->releaseSaveTicket( ticket );
-#endif
                         }
                 }

--- kdenetwork/kopete/kopete/kopeteballoon.cpp  #1.25:1.26
@@ -155,10 +155,5 @@ void KopeteBalloon::updateMask()
         // get screen-geometry for screen our anchor is on
         // (geometry can differ from screen to screen!
-        #if KDE_IS_VERSION( 3, 1, 90 )
                 QRect deskRect = KGlobalSettings::desktopGeometry(mAnchor);
-        #else
-                QDesktopWidget* tmp = QApplication::desktop();
-                QRect deskRect = tmp->screenGeometry(tmp->screenNumber(mAnchor));
-        #endif
 
         bool bottom = (mAnchor.y() + height()) > ((deskRect.y() + deskRect.height()-48));


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