initial public commit of qt4 portp1

1 files changed, 5 insertions, 3 deletions

diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 86898e2..4823b37 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -11,48 +11,50 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef KAB_EMBEDDED
 #include <qapplication.h>
 
 #include <kabc/distributionlistdialog.h>
 #include <kconfig.h>
 #include <klocale.h>
 
 #include "viewmanager.h"
 
 #endif //KAB_EMBEDDED
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kabc/distributionlistdialog.h>
 #include <kabc/addressbook.h>
 #include <kdebug.h>
 
 #include "kaddressbookview.h"
 
 KAddressBookView::KAddressBookView( KABC::AddressBook *ab, QWidget *parent,
                                     const char *name )
     : QWidget( parent, name ), mAddressBook( ab ), mFieldList()
 {
  
   initGUI();
 }
 
 KAddressBookView::~KAddressBookView()
 {
  
 }
 
 QRegExp KAddressBookView::getRegExp( const QString s )
 {
     QRegExp re;
     
@@ -112,49 +114,49 @@ QString KAddressBookView::selectedEmails()
 
       emailAddrs += email;
     }
   }
 
   return emailAddrs;
 }
 
 KABC::Addressee::List KAddressBookView::addressees()
 {
   KABC::Addressee::List addresseeList;
 
   KABC::AddressBook::Iterator it;
   for (it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
     if ( mFilter.filterAddressee( *it ) )
       addresseeList.append( *it );
   }
 
   return addresseeList;
 }
 
 void KAddressBookView::initGUI()
 {
   // Create the layout
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
 
   // Add the view widget
   mViewWidget = new QWidget( this );
   layout->addWidget( mViewWidget );
 }
 
 KABC::Field::List KAddressBookView::fields() const
 {
   return mFieldList;
 }
 KABC::Field::List KAddressBookView::allFields() const
 {
   return KABC::Field::allFields(); 
 }
 
 void KAddressBookView::setFilter( const Filter &filter )
 {
   mFilter = filter;
 }
 
 KAddressBookView::DefaultFilterType KAddressBookView::defaultFilterType() const
 {
   return mDefaultFilterType;
 }
@@ -162,27 +164,27 @@ KAddressBookView::DefaultFilterType KAddressBookView::defaultFilterType() const
 const QString &KAddressBookView::defaultFilterName() const
 {
   return mDefaultFilterName;
 }
 
 KABC::AddressBook *KAddressBookView::addressBook() const
 {
   return mAddressBook;
 }
 
 QWidget *KAddressBookView::viewWidget()
 {
   return mViewWidget;
 }
 
 ViewConfigureWidget *ViewFactory::configureWidget( KABC::AddressBook *ab,
                                                    QWidget *parent,
                                                    const char *name )
 {
   return new ViewConfigureWidget( ab, parent, name );
 }
 
  
 
-#ifndef KAB_EMBEDDED
-#include "kaddressbookview.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_kaddressbookview.cpp"
 #endif //KAB_EMBEDDED